[FIX JENKINS-40710, JENKINS-41513] JnlpAgentEndpointResolver - Add nu…

…ll check, use correct header for map key (#140)
jenkinsci · Jan 31, 2017 · 813489e · 813489e
1 parent 02b5964
commit 813489e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java
@@ -428,8 +428,8 @@ private static List<String> header(@Nonnull HttpURLConnection connection, String
         Map<String, List<String>> headerFields = connection.getHeaderFields();
         for (String headerName : headerNames) {
             for (String headerField : headerFields.keySet()) {
-                if (headerField.equalsIgnoreCase(headerName)) {
-                    return headerFields.get(headerName);
+                if (headerField != null && headerField.equalsIgnoreCase(headerName)) {
+                    return headerFields.get(headerField);
                 }
             }
         }