commit 31a2e952602981393cfd14bc9acadf7ab25fb298
author Dave Borowitz <dborowitz@google.com> Wed May 23 13:41:32 2018 -0400
committer Dave Borowitz <dborowitz@google.com> Thu May 24 07:45:46 2018 -0400
tree 2e0f07c50b96ffac4dea47ddc3d381c9f50277f0
parent bf39b0f7338464a47c4181d3ca879edc09e14ee5

ChangeKindCacheImpl: Don't use reference equality for trees

It is basically an implementation detail of the JGit RevWalk machinery
that the getTree() methods for two RevCommits from the same RevWalk
return the same RevTree instance. Although it may be a documented and
stable detail, the code is easier to reason about if we don't depend on
it. This particular code is in a cache loader, where we are certainly
not sensitive to the performance difference between == and
Objects#equals.

Change-Id: I7ae66ac80c1344560543692f6631f469f038c979

java/com/google/gerrit/server/change/ChangeKindCacheImpl.java

diff --git a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
index b2eb62d..f84c585 100644
--- a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
+++ b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
@@ -316,7 +316,7 @@
     }
 
     private static boolean isSameDeltaAndTree(RevCommit prior, RevCommit next) {
-      if (next.getTree() != prior.getTree()) {
+      if (!Objects.equals(next.getTree(), prior.getTree())) {
         return false;
       }
 
@@ -329,7 +329,7 @@
       // Make sure that the prior/next delta is the same - not just the tree.
       // This is done by making sure that the parent trees are equal.
       for (int i = 0; i < prior.getParentCount(); i++) {
-        if (next.getParent(i).getTree() != prior.getParent(i).getTree()) {
+        if (!Objects.equals(next.getParent(i).getTree(), prior.getParent(i).getTree())) {
           return false;
         }
       }