commit 75edbb04dc16d90df6b5542205edf8b370cffbf3
author Dave Borowitz <dborowitz@google.com> Wed Oct 29 15:19:47 2014 -0700
committer Dave Borowitz <dborowitz@google.com> Mon Nov 03 09:52:32 2014 -0800
tree ff619881a535a8460d329119db19c0189f95e9bc
parent 79bb12456dc21ca48dda3e41e7acd744e3aab6f7

ReceiveCommits: Avoid potential NPE in autoCloseChanges()

Change-Id: If201d1eff57008f8ae3bacdf078c6f8ce8448fb7

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 49080f7..053a60c 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
@@ -2393,6 +2393,9 @@
               closeChange(cmd, PatchSet.Id.fromRef(ref.getName()), c);
           closeProgress.update(1);
           if (closedChange != null) {
+            if (byKey == null) {
+              byKey = openChangesByKey(branch);
+            }
             byKey.remove(closedChange);
           }
         }