Merge pull request #7 from mathieu-pousse/master

[FIXED JENKINS-27678] Fix NullPointerException when nonProxyHost is not set
jenkinsci · Mar 31, 2015 · a75b5e6 · a75b5e6
2 parents cf7a86b + f2d3fa2
commit a75b5e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/Aether.java b/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/Aether.java
@@ -148,6 +148,9 @@ private void addProxySelectorIfNecessary(DefaultRepositorySystemSession reposito
 	}
 
 	public String convertHudsonNonProxyToJavaNonProxy(String hudsonNonProxy) {
+        if (StringUtils.isEmpty(hudsonNonProxy)) {
+            return "";
+        }
 		String[] nonProxyArray = hudsonNonProxy.split("[ \t\n,|]+");
 		String nonProxyOneLine = StringUtils.join(nonProxyArray, '|');
 		return nonProxyOneLine;

diff --git a/src/test/java/org/jvnet/hudson/plugins/repositoryconnector/aether/AetherTest.java b/src/test/java/org/jvnet/hudson/plugins/repositoryconnector/aether/AetherTest.java
@@ -1,18 +1,9 @@
 package org.jvnet.hudson.plugins.repositoryconnector.aether;
 
-import hudson.model.Cause;
-import hudson.model.FreeStyleProject;
-import hudson.model.Result;
-import hudson.tasks.Shell;
-import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.jvnet.hudson.plugins.repositoryconnector.Artifact;
-import org.jvnet.hudson.plugins.repositoryconnector.ArtifactResolver;
 
 import java.io.File;
-import java.io.PrintStream;
-import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,9 +12,8 @@ public class AetherTest {
     private Aether sut;
 
     @Before
-    public void setup()
-    {
-        sut = new Aether( new File("jenkinstest"), System.out, false );
+    public void setup() {
+        sut = new Aether(new File("jenkinstest"), System.out, false);
     }
 
     @Test
@@ -33,4 +23,9 @@ public void convertGivenNonHttpProxySettings() throws Exception {
 
         assertEquals("New lines should be replaced", result, "localhost|*.google.com|apple.com");
     }
+
+    @Test
+    public void convertGivenNullNonHttpProxySettings() throws Exception {
+        assertEquals("New lines should be replaced", sut.convertHudsonNonProxyToJavaNonProxy(null), "");
+    }
 }