diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-03-09 01:17:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-09 01:17:10 +0000 |
commit | 2257df4d4a6fddece712aac3626a4d0dc909e8d7 (patch) | |
tree | 12bf60fd836585df198104b3ce0da39366a3cee6 | |
parent | b99777141ab92961c62c289d96a662462daf89b1 (diff) | |
parent | 586c141db06dd0fc02bf29dac0ffed840c53b70a (diff) |
Merge "Prevent NPE in the SshLog" into stable-2.11
-rw-r--r-- | gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java | 6 |
1 files changed, 6 insertions, 0 deletions
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 439b8c8f13..b8b49eb320 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 @@ class SshLog implements LifecycleListener { } 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 @@ class SshLog implements LifecycleListener { } 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++) { |