Skip to content
Permalink
Browse files
Merge pull request #138 from jmittert/JENKINS-27260
[JENKINS-27260] SPNEGO for Windows in EC2 Plugin
  • Loading branch information
francisu committed Apr 11, 2015
2 parents 8a4454a + 0e840f7 commit 1ba2206f4345d08de2c8dc4261b52bef206f0010
Showing 2 changed files with 2 additions and 2 deletions.
@@ -30,7 +30,7 @@ protected void launch(EC2Computer computer, PrintStream logger, Instance inst) t

try {
String initScript = computer.getNode().initScript;
String tmpDir = (computer.getNode().tmpDir != null ? computer.getNode().tmpDir : "C:\\Windows\\Temp\\");
String tmpDir = (computer.getNode().tmpDir != null && !computer.getNode().tmpDir.equals("") ? computer.getNode().tmpDir : "C:\\Windows\\Temp\\");

logger.println("Creating tmp directory if it does not exist");
connection.execute("if not exist " + tmpDir + " mkdir " + tmpDir);
@@ -200,7 +200,7 @@ private void setupHTTPClient() {
private DefaultHttpClient buildHTTPClient()
{
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getAuthSchemes().unregister(AuthPolicy.SPNEGO);
//httpclient.getAuthSchemes().unregister(AuthPolicy.SPNEGO);
httpclient.setCredentialsProvider(credsProvider);
httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 5000);
//httpclient.setHttpRequestRetryHandler(new WinRMRetryHandler());

0 comments on commit 1ba2206

Please sign in to comment.