diff options
| author | Mika Hamalainen <mika.hamalainen@accenture.com> | 2011-10-05 11:39:10 +0300 |
|---|---|---|
| committer | Mika Hämäläinen <mika.hamalainen@accenture.com> | 2011-10-15 23:18:16 +0200 |
| commit | edcaf9ff0fa26667d336b0b8a6d54aa0f04109ec (patch) | |
| tree | d5f472d9fb1c96905db82cf12fec093475eb357e | |
| parent | 7569c539b315b845827f22f6b85031e2582ea4b2 (diff) | |
Fixed applyTypeFloor NPEBL-QTQAINFRA-335
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 <mika.hamalainen@accenture.com>
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
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()) { |