commit | 1e7930decf1b87cca3c4ed746d683957802fb728 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Thu Jun 27 15:46:10 2019 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Thu Jun 27 15:46:10 2019 +0900 |
tree | e28fa410e5935e8da8d58fea59dd530a8f981a80 | |
parent | fe578665e97e9d7b082bce0b62879b598305729b [diff] | |
parent | b80b7176b0a18024c946d056f29e90b497e44420 [diff] |
Merge branch 'stable-3.0' * stable-3.0: Make sure to always remove in-flight pushes Change-Id: Ib2e8e7edad116034840ebdc763e1f63489964b9e
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); } }