OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-30 04:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into JENKINS-19473

Browse Source
This commit is contained in:
Oliver Gondža committed 2017-09-24 16:05:51 +02:00
2 parents 08a4c5d05e 112ceeba3a
commit fd08d75213
479 files changed
+9442 -1269
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/FilePath.java
+3 -3
View File
@@ -2042,7 +2042,7 @@ public final class FilePath implements Serializable {
/**
* With fix to JENKINS-11251 (remoting 2.15), this is no longer necessary.
* But I'm keeping it for a while so that users who manually deploy slave.jar has time to deploy new version
* But I'm keeping it for a while so that users who manually deploy agent.jar has time to deploy new version
* before this goes away.
*/
private void syncIO() throws InterruptedException {
@@ -2050,9 +2050,9 @@ public final class FilePath implements Serializable {
if (channel!=null)
channel.syncLocalIO();
} catch (AbstractMethodError e) {
// legacy slave.jar. Handle this gracefully
// legacy agent.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);
LOGGER.log(Level.WARNING,"Looks like an old agent.jar. Please update "+ Which.jarFile(Channel.class)+" to the new version",e);
} catch (IOException _) {
// really ignore this time
}