opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Update cookbook plugin to latest revision
  OpenID: Add support for Launchpad on the login form
  OpenID: Remove support for Google Accounts
  Prevent NPE in ListTasks

Change-Id: I884119bf607031d00d36713e1518274030790218
This commit is contained in:
David Pursehouse
2015-03-03 10:27:15 +09:00
parent cad3c6db79 9c61a37fef
commit 3d48b90869
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java
View File

@@ -124,7 +124,10 @@ public class ListTasks implements RestReadView<ConfigResource> {
if (task instanceof ProjectTask) {
ProjectTask<?> projectTask = ((ProjectTask<?>) task);
this.projectName = projectTask.getProjectNameKey().get();
Project.NameKey name = projectTask.getProjectNameKey();
if (name != null) {
this.projectName = name.get();
}
this.remoteName = projectTask.getRemoteName();
}
}