Merge "Fix "Failed to reindex changes"" into stable-2.11

1 files changed, 4 insertions, 1 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexAfterUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexAfterUpdate.java
index 45b7c4da31..8ec82c3e5f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexAfterUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexAfterUpdate.java
@@ -141,7 +141,10 @@ public class ReindexAfterUpdate implements GitReferenceUpdatedListener {
       // Reload change, as some time may have passed since GetChanges.
       ReviewDb db = ctx.getReviewDbProvider().get();
       Change c = db.changes().get(id);
-      indexerFactory.create(executor, indexes).index(db, c);
+      // The change might have been a draft and got deleted
+      if (c != null) {
+        indexerFactory.create(executor, indexes).index(db, c);
+      }
       return null;
     }