commit 2257df4d4a6fddece712aac3626a4d0dc909e8d7
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Mar 09 01:17:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 09 01:17:10 2016 +0000
tree 12bf60fd836585df198104b3ce0da39366a3cee6
parent b99777141ab92961c62c289d96a662462daf89b1
parent 586c141db06dd0fc02bf29dac0ffed840c53b70a

Merge "Prevent NPE in the SshLog" into stable-2.11

gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
index 439b8c8..b8b49eb 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
@@ -152,6 +152,9 @@
   }
 
   private Multimap<String, ?> extractParameters(DispatchCommand dcmd) {
+    if (dcmd == null) {
+      return ArrayListMultimap.create(0, 0);
+    }
     String[] cmdArgs = dcmd.getArguments();
     String paramName = null;
     int argPos = 0;
@@ -268,6 +271,9 @@
   }
 
   private String extractWhat(DispatchCommand dcmd) {
+    if (dcmd == null) {
+      return "Command was already destroyed";
+    }
     StringBuilder commandName = new StringBuilder(dcmd.getCommandName());
     String[] args = dcmd.getArguments();
     for (int i = 1; i < args.length; i++) {