commit 792f8c170ffb2d3e807ec51bfb7286e1f45f5968
author Shawn Pearce <sop@google.com> Thu Oct 16 14:40:22 2014 -0700
committer Shawn Pearce <sop@google.com> Thu Oct 16 14:40:22 2014 -0700
tree 28ea400e134523879aff98f5963bbb0e23e779ef
parent c2535f6aa822db36daefdc9ccb0fe7e70c9eb52d

Simplify autoCloseCommits() handling of exact SHA-1 matches

Ref objects inside of the byCommit map cannot be null.
The ref != null test is always true, and can be dropped.

While we are cleaning up this code, inline the Set<Ref>
that is used only for the loop control.

Change-Id: I8fc9a62672b94203ababf8f5b529ded727cf700a

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 84d04f8..2b3cc57 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -2391,15 +2391,12 @@
       for (RevCommit c; (c = rw.next()) != null;) {
         rw.parseBody(c);
 
-        final Set<Ref> refs = byCommit.get(c.copy());
-        for (Ref ref : refs) {
-          if (ref != null) {
-            Change.Key closedChange =
-                closeChange(cmd, PatchSet.Id.fromRef(ref.getName()), c);
-            closeProgress.update(1);
-            if (closedChange != null) {
-              byKey.remove(closedChange);
-            }
+        for (Ref ref : byCommit.get(c.copy())) {
+          Change.Key closedChange =
+              closeChange(cmd, PatchSet.Id.fromRef(ref.getName()), c);
+          closeProgress.update(1);
+          if (closedChange != null) {
+            byKey.remove(closedChange);
           }
         }