diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-05-01 06:15:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-01 06:15:36 +0000 |
commit | 17d5f1f8e21a35434b94d81f1c61d78955edd04e (patch) | |
tree | eaa4c5a51167f89ad0c58ca78f77be73f0d2b91a | |
parent | eb44c0e18b2b834b9e014875ef4e374080448f45 (diff) | |
parent | 3d35012d512a8d54382848379b798027f9b0ceda (diff) |
Merge "Fix "Failed to reindex changes"" into stable-2.11
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexAfterUpdate.java | 5 |
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; } |