Merge pull request #39 from SimonStJG/fix

JENKINS-41873 Only set HTTP Proxy credentials provider if credentials are non-empty
jenkinsci · Aug 7, 2017 · b4ace2f · b4ace2f
2 parents 920f70f + f4b3bcd
commit b4ace2f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/main/java/hockeyapp/HockeyappRecorder.java b/src/main/java/hockeyapp/HockeyappRecorder.java
@@ -155,16 +155,14 @@ private HttpClient createPreconfiguredHttpClient() {
         if (Hudson.getInstance() != null && Hudson.getInstance().proxy != null) {
 
             ProxyConfiguration configuration = Hudson.getInstance().proxy;
-            Credentials cred = null;
 
             if (configuration.getUserName() != null && !configuration.getUserName().isEmpty()) {
-                cred = new UsernamePasswordCredentials(configuration.getUserName(), configuration.getPassword());
+                Credentials credentials = new UsernamePasswordCredentials(configuration.getUserName(), configuration.getPassword());
+                CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+                credentialsProvider.setCredentials(new AuthScope(configuration.name, configuration.port), credentials);
+                httpclient.getCredentialsProvider().setCredentials(new AuthScope(configuration.name, configuration.port), credentials);
             }
 
-            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(new AuthScope(configuration.name, configuration.port), cred);
-
-            httpclient.getCredentialsProvider().setCredentials(new AuthScope(configuration.name, configuration.port), cred);
             HttpHost proxy = new HttpHost(configuration.name, configuration.port);
             httpclient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
         }