Merge "379116: start.jar fix to shutdown child processes with --exec. Remove finally block and replace with a shutdown hook in _exec if branch."

1 files changed, 16 insertions, 13 deletions

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 70fbe1063f..d4f503b45e 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -550,22 +550,25 @@ public class Main
         if (_exec)
         {
             CommandLineBuilder cmd = buildCommandLine(classpath,configuredXmls);
+            
             ProcessBuilder pbuilder = new ProcessBuilder(cmd.getArgs());
             final Process process = pbuilder.start();
-            
-            try
-            {
-                copyInThread(process.getErrorStream(),System.err);
-                copyInThread(process.getInputStream(),System.out);
-                copyInThread(System.in,process.getOutputStream());
-                monitor.setProcess(process);
-                process.waitFor();
-            }
-            finally
+            Runtime.getRuntime().addShutdownHook(new Thread()
             {
-                Config.debug("Destroying " + process);
-                process.destroy();
-            }
+                @Override
+                public void run()
+                {
+                    Config.debug("Destroying " + process);
+                    process.destroy();
+                }
+            });
+            
+            copyInThread(process.getErrorStream(),System.err);
+            copyInThread(process.getInputStream(),System.out);
+            copyInThread(System.in,process.getOutputStream());
+            monitor.setProcess(process);
+            process.waitFor();
+            
             return;
         }