opendev/gerrit
Code Issues Proposed changes

Fix NPE in ChangeJson

Browse Source 
The `draft` member is a Boolean but is set to either true or
null.  This causes NPE when checking `out.draft`.

Change the condition to `out.draft != null && out.draft`.

Change-Id: I18268c2e2f40dd07f9660788db51123573eb3e01
This commit is contained in:
David Pursehouse
2013-09-30 18:50:01 +09:00
committed by Shawn Pearce
parent cff6c16377
commit 586c380847
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -822,7 +822,7 @@ public class ChangeJson {
} }
} }
if ((out.isCurrent || out.draft) if ((out.isCurrent || (out.draft != null && out.draft))
&& has(CURRENT_ACTIONS) && has(CURRENT_ACTIONS)
&& userProvider.get().isIdentifiedUser()) { && userProvider.get().isIdentifiedUser()) {
out.actions = Maps.newTreeMap(); out.actions = Maps.newTreeMap();