Permalink
Browse files

Merge pull request #171 from ndeloof/master

[JENKINS-21520] transient NoClassDefFoundError: javax/servlet/ServletException
  • Loading branch information...
MarkEWaite committed Jul 10, 2015
2 parents 886a322 + 377561e commit 0b57fecc2bb9c6aa2087f5aceaf82326b62b5859
@@ -2,7 +2,6 @@

import hudson.EnvVars;
import hudson.Extension;
import hudson.Functions;
import hudson.init.Initializer;
import hudson.model.EnvironmentSpecific;
import hudson.model.Node;
@@ -131,7 +130,7 @@ public static void onLoaded() {
return;
}

String defaultGitExe = Functions.isWindows() ? "git.exe" : "git";
String defaultGitExe = isWindows() ? "git.exe" : "git";
GitTool tool = new GitTool(DEFAULT, defaultGitExe, Collections.<ToolProperty<?>>emptyList());
descriptor.setInstallations(new GitTool[] { tool });
descriptor.save();
@@ -192,5 +191,10 @@ public GitTool getInstallation(String name) {
}

private static final Logger LOGGER = Logger.getLogger(GitTool.class.getName());

/** inline ${@link hudson.Functions#isWindows()} to prevent a transient remote classloader issue */
private static boolean isWindows() {
return File.pathSeparatorChar==';';
}
}

@@ -79,7 +79,7 @@
private StandardCredentials defaultCredentials;

private void warnIfWindowsTemporaryDirNameHasSpaces() {
if (!Functions.isWindows()) {
if (!isWindows()) {
return;
}
String[] varsToCheck = {"TEMP", "TMP"};
@@ -644,7 +644,7 @@ public ObjectId revParse(String revName) throws GitException, InterruptedExcepti
* See https://github.com/msysgit/msysgit/issues/36 where I filed this as a bug to msysgit.
**/
private String sanitize(String arg) {
if (Functions.isWindows())
if (isWindows())
arg = '"'+arg+'"';
return arg;
}
@@ -2530,4 +2530,11 @@ private String getGitCredentialsURL(URIish u, StandardCredentials cred) {
* best to avoid git interactively asking for credentials, there are many of other cases where git may hang.
*/
public static final int TIMEOUT = Integer.getInteger(Git.class.getName() + ".timeOut", 10);

/** inline ${@link hudson.Functions#isWindows()} to prevent a transient remote classloader issue */
private boolean isWindows() {
return File.pathSeparatorChar==';';
}


}

0 comments on commit 0b57fec

Please sign in to comment.