diff options
| author | Yuxuan 'fishy' Wang <fishywang@google.com> | 2016-04-19 23:21:40 -0700 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-04-21 04:43:44 +0000 |
| commit | 847fa63e028bd1cfa627bfea21ef803114228aa6 (patch) | |
| tree | f8fd3ef742c114dfe4976fc1c70b5556636024a3 | |
| parent | 897c9b804178da4304d38a18f62cee869eae6fb9 (diff) | |
Fix NPE in SubmitRuleEvaluator
Throw OrmException when we cannot get any patch set in
SubmitRuleEvaluator#initPatchSet, so we won't get NPE in callers.
Change-Id: I630aa2cc905c09187433cc45c19f5c61a171b977
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java index 4df9831434..6c6e3c2831 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java @@ -603,6 +603,9 @@ public class SubmitRuleEvaluator { private void initPatchSet() throws OrmException { if (patchSet == null) { patchSet = cd.currentPatchSet(); + if (patchSet == null) { + throw new OrmException("No patch set found"); + } } } |