commit b80b7176b0a18024c946d056f29e90b497e44420
author Luca Milanesio <luca.milanesio@gmail.com> Fri Jun 21 14:06:04 2019 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Fri Jun 21 14:06:10 2019 +0100
tree 545f42618d5f5348b91148b1a4489fb45af20ce2
parent d5dc413fafa3bdb5e61f25f5f936f76e8c58d681
parent 6fcdcf98fe61e8c6258fb40967f0cff6b8c38fd4

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Make sure to always remove in-flight pushes

Change-Id: I574e150181d4cc63c8ebf6371b05093ee569c093

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index 3ef1707..168c95f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -389,10 +389,10 @@
     } catch (PermissionBackendException | RuntimeException | Error e) {
       stateLog.error("Unexpected error during replication to " + uri, e, getStatesAsArray());
     } finally {
+      pool.notifyFinished(this);
       if (git != null) {
         git.close();
       }
-      pool.notifyFinished(this);
     }
   }