opendev/gerrit
Code Issues Proposed changes

Do not expect ApprovalType of Category SUBM

Browse Source 
Pushing a new, rebased Patch Set for a Change failed with a
NullPointer if the first Patch Set could not be merged due
to a patch conflict.

The reason was that there is no ApprovalType of Category SUBM
anymore, but it is still stored in the database.

Change-Id: I058ba99b835813245283c04fdb08199c94957645
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
This commit is contained in:
Stefan Lay
2011-05-18 15:09:00 -07:00
committed by Shawn O. Pearce
parent 6a765190df
commit 71bebadf9f
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java
View File

@@ -171,7 +171,9 @@ public class PublishComments implements Callable<VoidResult> {
final short o = a.getValue();
a.setValue(want.get());
a.cache(change);
functionState.normalize(types.byId(a.getCategoryId()), a);
if (!ApprovalCategory.SUBMIT.equals(a.getCategoryId())) {
functionState.normalize(types.byId(a.getCategoryId()), a);
}
if (o != a.getValue()) {
// Value changed, ensure we update the database.
//