commit 054122e7824ed64f3e3b697d97afa187ec91417e
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Oct 01 11:53:06 2014 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Wed Oct 01 11:54:04 2014 +0900
tree ee0d9384d7259b05ad924e5d61f10dd6eb034d06
parent 677c250ce56e8631751e2a6a58276a0138b20b08
parent efe4dbd1fcd3208d36d886391c7e51eddf1bfa68

Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Avoid throwing exception due to deleted change

Change-Id: I87fc07bd38aa07a02609d5d24afa101366f42406

src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
index bc503ac..fd4cebf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
@@ -179,7 +179,10 @@
         try {
           ReviewDb db = schema.open();
           try {
-            hooks.postEvent(retrieveChange(ref, db), event, db);
+            Change change = retrieveChange(ref, db);
+            if (change != null) {
+              hooks.postEvent(change, event, db);
+            }
           } finally {
             db.close();
           }
@@ -196,9 +199,6 @@
         throws OrmException, NoSuchChangeException {
       PatchSet.Id id = PatchSet.Id.fromRef(ref);
       Change change = db.changes().get(id.getParentKey());
-      if (change == null) {
-        throw new NoSuchChangeException(id.getParentKey());
-      }
       return change;
     }
   }