[JENKINS-39617] - JnlpAgentEndpointResolver should not fail if one of…

… the URLs is malformed
jenkinsci · Nov 9, 2016 · ecefcc7 · ecefcc7
1 parent fa398e1
commit ecefcc7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java
@@ -127,7 +127,16 @@ public void setTunnel(String tunnel) {
     public JnlpAgentEndpoint resolve() throws IOException {
         IOException firstError = null;
         for (String jenkinsUrl : jenkinsUrls) {
-            URL salURL = toAgentListenerURL(jenkinsUrl);
+
+            final URL selectedJenkinsURL;
+            final URL salURL;
+            try {
+                selectedJenkinsURL = new URL(jenkinsUrl);
+                salURL = toAgentListenerURL(jenkinsUrl);
+            } catch (MalformedURLException ex) {
+                LOGGER.log(Level.WARNING, String.format("Cannot parse agent endpoint URL %s. Skipping it", jenkinsUrl), ex);
+                continue;
+            }
 
             // find out the TCP port
             HttpURLConnection con =