opendev/gerrit
Code Issues Proposed changes

Fix NPE in PatchScreen

Browse Source 
The patchSetId is passed through as null to CommitMessageBlock
when opening either the side-by-side or unified patch screens.
Avoid calling getPatchSetId() in these cases.

Change-Id: Id93dcdbd1dc7baef64341b86d37b4dc0d28679cb
This commit is contained in:
Shawn O. Pearce
2012-11-20 21:15:06 -08:00
parent b2588da32c
commit 840eed6631
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
View File

@@ -72,8 +72,8 @@ public class CommitMessageBlock extends Composite {
public void display(final PatchSet.Id patchSetId,
Boolean starred, Boolean canEditCommitMessage, final String commitMessage) {
starPanel.clear();
Change.Id changeId = patchSetId.getParentKey();
if (changeId != null && starred != null && Gerrit.isSignedIn()) {
if (patchSetId != null && starred != null && Gerrit.isSignedIn()) {
Change.Id changeId = patchSetId.getParentKey();
StarredChanges.Icon star = StarredChanges.createIcon(changeId, starred);
star.setStyleName(Gerrit.RESOURCES.css().changeScreenStarIcon());
starPanel.add(star);
@@ -84,7 +84,8 @@ public class CommitMessageBlock extends Composite {
}
permalinkPanel.clear();
if (changeId != null) {
if (patchSetId != null) {
Change.Id changeId = patchSetId.getParentKey();
permalinkPanel.add(new ChangeLink(Util.C.changePermalink(), changeId));
permalinkPanel.add(new CopyableLabel(ChangeLink.permalink(changeId),
false));