opendev/gerrit
Code Issues Proposed changes

Fix potential NPE in ShowQueue

Browse Source 
taskInfo.getProjectNameKey() may return null.

Change-Id: Iac86fe43b308c5a63ae52eb6d82c858e897c16f0
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2014-03-04 14:16:12 +01:00
parent 4d3ac76f18
commit f985847c38
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.sshd.commands;
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 @@ final class ShowQueue extends SshCommand {
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("----------------------------------------------"