| commit | 42a2306d9b746f97f436f9c75982a6dc2b4d84d3 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Thu Apr 30 11:24:57 2020 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Thu Apr 30 11:25:37 2020 +0100 |
| tree | d132f9697d4b6bd300337087547ab9befea62f8a | |
| parent | 864bc26714111ed8fd4e7b402e7830482b57cde0 [diff] | |
| parent | 8eca3e95316bacc64d296acbbe1cc5e6534954c6 [diff] |
Merge branch 'stable-3.1' * stable-3.1: Don't reset storage when rescheduling for collisions Change-Id: I395aedd271fdadf2aaeabcfb740f81cf42c0c33a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java index 4aa74c7..d53b9c0 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -533,7 +533,6 @@ pending.put(uri, pushOp); switch (reason) { case COLLISION: - replicationTasksStorage.get().reset(pushOp); @SuppressWarnings("unused") ScheduledFuture<?> ignored = pool.schedule(pushOp, config.getRescheduleDelay(), TimeUnit.SECONDS);