SshScheme: Fix NullPointerException when SSH address is malformed Change-Id: Ie4a152d66bc6a83b56f888a34edf82085274a1d5 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
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;