From edcaf9ff0fa26667d336b0b8a6d54aa0f04109ec Mon Sep 17 00:00:00 2001 From: Mika Hamalainen Date: Wed, 5 Oct 2011 11:39:10 +0300 Subject: Fixed applyTypeFloor NPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NPE was caused by old-style staging approvals which were not filtered out as the submit approvals are. Change-Id: I55e1d40c6e2476bd48d371cdf980531af12662be Reviewed-by: Mika Hämäläinen --- .../java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java index d8e96dcaf5..a96c3c9384 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java @@ -187,7 +187,8 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements for (final PatchSetApproval ca : db.patchSetApprovals() .byPatchSetUser(ps_id, aid)) { final ApprovalCategory.Id category = ca.getCategoryId(); - if (ApprovalCategory.SUBMIT.equals(category)) { + if (ApprovalCategory.SUBMIT.equals(category) + || ApprovalCategory.STAGING.equals(category)) { continue; } if (change.getStatus().isOpen()) { -- cgit v1.2.3