commit 61395a2f263bd9722445908e9e07a42050a132f7
author Edwin Kempin <edwin.kempin@sap.com> Mon Jul 06 13:06:19 2015 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Mon Jul 06 13:06:19 2015 +0200
tree 5b006f16813c028ed2e3416e299100e249d970cc
parent de482c42d46bc6254370ccb33fe9700697c05e26

SshScheme: Fix NullPointerException when SSH address is malformed

Change-Id: Ie4a152d66bc6a83b56f888a34edf82085274a1d5
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
index e190569..7af728d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
@@ -54,17 +54,21 @@
     this.sshdAddress = sshAddr;
 
     int port = 29418;
-    int p = sshdAddress.indexOf(":");
-    if (p > 0) {
-      this.sshdHost = sshdAddress.substring(0, p);
-      try {
-        port = Integer.parseInt(sshdAddress.substring(p + 1));
-      } catch (NumberFormatException e) {
-        // use default port
+    String host = sshdAddress;
+    if (sshdAddress != null) {
+      int p = sshdAddress.indexOf(":");
+      if (p > 0) {
+        host = sshdAddress.substring(0, p);
+        try {
+          port = Integer.parseInt(sshdAddress.substring(p + 1));
+        } catch (NumberFormatException e) {
+          // use default port
+        }
+      } else {
+        host = sshdAddress;
       }
-    } else {
-      this.sshdHost = sshdAddress;
     }
+    this.sshdHost = host;
     this.sshdPort = port;
 
     this.userProvider = userProvider;