From fc5aa88b66ba3dbff6932a5d8459599d6c6bf6a9 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 10 May 2011 16:21:10 -0700
Subject: [PATCH] handle legacy slave.jar gracefully

---
 changelog.html                          |  3 +++
 core/src/main/java/hudson/FilePath.java | 27 +++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index f669f3b0ab..86209f4e88 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=rfe>
+    Gracefully handle old slave.jar to avoid <tt>AbstractMethodError</tt>
+    (<a href="https://groups.google.com/d/topic/jenkinsci-dev/KqFw4nfiQdE/discussion">thread</a>)
   <li class=rfe>
     Debian packages now do log rotation
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8641">issue 8641</a>)
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 6fbba0a519..57c3fa2133 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -39,6 +39,7 @@ import hudson.remoting.Pipe;
 import hudson.remoting.RemoteOutputStream;
 import hudson.remoting.VirtualChannel;
 import hudson.remoting.RemoteInputStream;
+import hudson.remoting.Which;
 import hudson.security.AccessControlled;
 import hudson.util.DirScanner;
 import hudson.util.IOException2;
@@ -85,6 +86,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.concurrent.ExecutionException;
@@ -1419,8 +1421,29 @@ public final class FilePath implements Serializable {
         });
 
         // make sure the write fully happens before we return.
-        if (channel!=null)
-            channel.syncLocalIO();
+        syncIO();
+    }
+
+    private void syncIO() throws InterruptedException {
+        try {
+            if (channel!=null)
+                _syncIO();
+        } catch (AbstractMethodError e) {
+            // legacy slave.jar. Handle this gracefully
+            try {
+                LOGGER.log(Level.WARNING,"Looks like an old slave.jar. Please update "+ Which.jarFile(Channel.class)+" to the new version",e);
+            } catch (IOException _) {
+                // really ignore this time
+            }
+        }
+    }
+
+    /**
+     * A pointless function to work around what appears to be a HotSpot problem. See JENKINS-5756 and bug 6933067
+     * on BugParade for more details.
+     */
+    private void _syncIO() throws InterruptedException {
+        channel.syncLocalIO();
     }
 
     /**
-- 
GitLab