Fixed possible null pointer error

jenkinsci · Nov 15, 2016 · 993a44a · 993a44a
1 parent ebb2e97
commit 993a44a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/src/main/java/hudson/scm/SSCMUtils.java b/src/main/java/hudson/scm/SSCMUtils.java
@@ -25,13 +25,16 @@ public class SSCMUtils {
    */
   public static String getServerFromURL(String URL)
   {
-    Matcher changeMatcher = URI_PATTERN.matcher(URL);
-
     String result = "";
 
-    if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+    if(URL != null)
     {
-      result = changeMatcher.group(1);
+      Matcher changeMatcher = URI_PATTERN.matcher(URL);
+
+      if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+      {
+        result = changeMatcher.group(1);
+      }
     }
 
     return result;
@@ -47,13 +50,16 @@ public static String getServerFromURL(String URL)
    */
   public static String getPortFromURL(String URL)
   {
-    Matcher changeMatcher = URI_PATTERN.matcher(URL);
-
     String result = "";
 
-    if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+    if(URL != null)
     {
-      result = changeMatcher.group(2);
+      Matcher changeMatcher = URI_PATTERN.matcher(URL);
+
+      if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+      {
+        result = changeMatcher.group(2);
+      }
     }
 
     return result;
@@ -69,13 +75,16 @@ public static String getPortFromURL(String URL)
    */
   public static String getBranchFromURL(String URL)
   {
-    Matcher changeMatcher = URI_PATTERN.matcher(URL);
-
     String result = "";
 
-    if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+    if(URL != null)
     {
-      result = changeMatcher.group(3);
+      Matcher changeMatcher = URI_PATTERN.matcher(URL);
+
+      if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+      {
+        result = changeMatcher.group(3);
+      }
     }
 
     return result;
@@ -91,20 +100,25 @@ public static String getBranchFromURL(String URL)
    */
   public static String getRepositoryFromURL(String URL)
   {
-    Matcher changeMatcher = URI_PATTERN.matcher(URL);
-
     String result = "";
 
-    if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+    if(URL != null)
     {
-      result = changeMatcher.group(4);
+      Matcher changeMatcher = URI_PATTERN.matcher(URL);
+
+      if(changeMatcher.find() && changeMatcher.groupCount() == 4)
+      {
+        result = changeMatcher.group(4);
+      }
     }
 
     return result;
   }
 
   public static boolean validateSSCMURL(String URL)
   {
+    if(URL == null)
+      return false;
 
     Matcher changeMatcher = URI_PATTERN.matcher(URL);
 

diff --git a/src/test/java/hudson/scm/SSCMUtilsTest.java b/src/test/java/hudson/scm/SSCMUtilsTest.java
@@ -122,6 +122,8 @@ public void testInvalidURL_Repo() throws Exception {
 
   public void testValidateURL() throws Exception {
     assertTrue(SSCMUtils.validateSSCMURL(URL));
+
+    assertFalse(SSCMUtils.validateSSCMURL(null));
   }
 
   public static Test suite() {