commit 1e7d62cdcc8d461cc098999acdf96b7f2ee20ba9
author David Pursehouse <dpursehouse@collab.net> Thu Sep 06 17:33:26 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Sep 06 17:34:05 2018 +0900
tree 8fba380cb98398360168925a1ab79639631e366d
parent 739f704b79712326df68fd902f822607cf48f546

ChangeBundle: Fix operator precedence warning raised by ErrorProne

Add grouping parentheses to make the operator precedence explicit.

See http://errorprone.info/bugpattern/OperatorPrecedence

Change-Id: Iaf80a165e640f19bcb95b579cd3aba45ad9b20ba

gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
index d5b1b3d..acfbbac 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
@@ -442,7 +442,7 @@
       excludeOrigSubj = true;
       String aTopic = trimOrNull(a.getTopic());
       excludeTopic =
-          Objects.equals(aTopic, b.getTopic()) || "".equals(aTopic) && b.getTopic() == null;
+          Objects.equals(aTopic, b.getTopic()) || ("".equals(aTopic) && b.getTopic() == null);
       aUpdated = bundleA.getLatestTimestamp();
     } else if (bundleA.source == NOTE_DB && bundleB.source == REVIEW_DB) {
       excludeCreatedOn =
@@ -454,7 +454,7 @@
       excludeOrigSubj = true;
       String bTopic = trimOrNull(b.getTopic());
       excludeTopic =
-          Objects.equals(bTopic, a.getTopic()) || a.getTopic() == null && "".equals(bTopic);
+          Objects.equals(bTopic, a.getTopic()) || (a.getTopic() == null && "".equals(bTopic));
       bUpdated = bundleB.getLatestTimestamp();
     }
 
@@ -748,7 +748,8 @@
         excludePostSubmit = a.getValue() == 0 && b.isPostSubmit();
       } else if (bundleA.source == NOTE_DB && bundleB.source == REVIEW_DB) {
         excludeGranted =
-            tb.before(psb.getCreatedOn()) && ta.equals(psa.getCreatedOn()) || tb.compareTo(ta) < 0;
+            (tb.before(psb.getCreatedOn()) && ta.equals(psa.getCreatedOn()))
+                || (tb.compareTo(ta) < 0);
         excludePostSubmit = b.getValue() == 0 && a.isPostSubmit();
       }