From 424ccf1771e1d182a55efe6fa21eae6a65e55cf9 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jbachorik@openjdk.org>
Date: Fri, 24 Oct 2014 18:33:42 +0200
Subject: [PATCH] 8062070: com/sun/jdi/DoubleAgentTest.java.DoubleAgentTest
 fails intermittently after 8056143

Reviewed-by: dholmes
---
 jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
index 4698a078b78..290a8795c7e 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
@@ -319,13 +319,14 @@ public final class ProcessTools {
 
             return output;
         } catch (Throwable t) {
+            if (p != null) {
+                p.destroyForcibly().waitFor();
+            }
+
             failed = true;
             System.out.println("executeProcess() failed: " + t);
             throw t;
         } finally {
-            if (p != null) {
-                p.destroyForcibly().waitFor();
-            }
             if (failed) {
                 System.err.println(getProcessLog(pb, output));
             }