From d280f213c438fcb14aa7bae76ed150ae8ad2365c Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Tue, 10 Mar 2009 19:32:23 +0000
Subject: [PATCH]     Recover gracefully from failing to load winp.     (<a
 href="http://www.nabble.com/Unable-to-load-winp.dll-td22423157.html">report</a>)

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16153 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../java/hudson/util/ProcessTreeKiller.java     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/util/ProcessTreeKiller.java b/core/src/main/java/hudson/util/ProcessTreeKiller.java
index 26967ff494..264883ce23 100644
--- a/core/src/main/java/hudson/util/ProcessTreeKiller.java
+++ b/core/src/main/java/hudson/util/ProcessTreeKiller.java
@@ -126,16 +126,21 @@ public abstract class ProcessTreeKiller {
         if(!enabled)
             return DEFAULT;
 
-        if(File.pathSeparatorChar==';')
+        try {
+            if(File.pathSeparatorChar==';')
             return new Windows();
 
-        String os = Util.fixNull(System.getProperty("os.name"));
-        if(os.equals("Linux"))
+            String os = Util.fixNull(System.getProperty("os.name"));
+            if(os.equals("Linux"))
             return new Linux();
-        if(os.equals("SunOS"))
+            if(os.equals("SunOS"))
             return new Solaris();
-        if(os.equals("Mac OS X"))
-            return new Darwin();
+            if(os.equals("Mac OS X"))
+                return new Darwin();
+        } catch (LinkageError e) {
+            LOGGER.warning("Failed to load winp. Reverting to the default");
+            enabled = false;
+        }
 
         return DEFAULT;
     }
-- 
GitLab