Fix potential NPE in ShowQueue
taskInfo.getProjectNameKey() may return null.
Change-Id: Iac86fe43b308c5a63ae52eb6d82c858e897c16f0
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
index 40f7059..77d79b3 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
@@ -16,6 +16,7 @@
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
+import com.google.common.base.Objects;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.git.TaskInfoFactory;
@@ -139,14 +140,17 @@
id(taskInfo.getTaskId()), start, startTime, "",
taskInfo.getTaskString(taskNameWidth)));
} else if (regularUserCanSee) {
- if (remoteName == null) {
- remoteName = projectName.get();
- } else {
- remoteName = remoteName + "/" + projectName;
+ if (projectName != null) {
+ if (remoteName == null) {
+ remoteName = projectName.get();
+ } else {
+ remoteName = remoteName + "/" + projectName.get();
+ }
}
- stdout.print(String.format("%8s %-12s %-4s %s\n", //
- id(taskInfo.getTaskId()), start, startTime, remoteName));
+ stdout.print(String.format("%8s %-12s %-4s %s\n",
+ id(taskInfo.getTaskId()), start, startTime,
+ Objects.firstNonNull(remoteName, "n/a")));
}
}
stdout.print("----------------------------------------------"
