[FIXED JENKINS-21341] Merge pull request #1169 from pliljenberg/master

Ugly hack to fix destroyProcess for Java8 (cherry picked from commit 19640e7)
jenkinsci · Jan 9, 2015 · 90e9898 · 90e9898
1 parent 82d6292
commit 90e9898
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
@@ -428,15 +428,15 @@ public synchronized List<String> getArguments() {
                     public synchronized EnvVars getEnvironmentVariables() {
                         if(env !=null)
                           return env;
-                        env = new EnvVars();   
-                        
-                        try 
+                        env = new EnvVars();
+
+                        try
                         {
                            env.putAll(p.getEnvironmentVariables());
                         } catch (WinpException e)
                         {
                            LOGGER.log(FINE, "Failed to get environment variable ", e);
-                        }                          
+                        }
                         return env;
                     }
                 });
@@ -549,7 +549,7 @@ public void kill() throws InterruptedException {
             try {
                 int pid = getPid();
                 LOGGER.fine("Killing pid="+pid);
-                UnixReflection.DESTROY_PROCESS.invoke(null, pid);
+                UnixReflection.destroy(pid);
             } catch (IllegalAccessException e) {
                 // this is impossible
                 IllegalAccessError x = new IllegalAccessError();
@@ -604,7 +604,11 @@ private static final class UnixReflection {
                 PID_FIELD = clazz.getDeclaredField("pid");
                 PID_FIELD.setAccessible(true);
 
-                DESTROY_PROCESS = clazz.getDeclaredMethod("destroyProcess",int.class);
+                if (isPreJava8()) {
+                    DESTROY_PROCESS = clazz.getDeclaredMethod("destroyProcess",int.class);
+                } else {
+                    DESTROY_PROCESS = clazz.getDeclaredMethod("destroyProcess",int.class, boolean.class);
+                }
                 DESTROY_PROCESS.setAccessible(true);
             } catch (ClassNotFoundException e) {
                 LinkageError x = new LinkageError();
@@ -620,6 +624,19 @@ private static final class UnixReflection {
                 throw x;
             }
         }
+
+        public static void destroy(int pid) throws IllegalAccessException, InvocationTargetException {
+            if (isPreJava8()) {
+                DESTROY_PROCESS.invoke(null, pid);
+            } else {
+                DESTROY_PROCESS.invoke(null, pid, false);
+            }
+        }
+
+        private static boolean isPreJava8() {
+            int javaVersionAsAnInteger = Integer.parseInt(System.getProperty("java.version").replaceAll("\\.", "").replaceAll("_", "").substring(0, 2));
+            return javaVersionAsAnInteger < 18;
+        }
     }