diff options
author | David Pursehouse <dpursehouse@digital.ai> | 2020-05-16 14:00:42 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@digital.ai> | 2020-05-16 14:00:42 +0900 |
commit | 3ca941e6bc700c6f40ac45c8f3188c4c48bc8620 (patch) | |
tree | b0c5f4822c2c486d7426c8d10e9d137a0a2eecc2 | |
parent | 2a24edffa9a54e41e565a911897619ee7b69045c (diff) | |
parent | c8d1a5bac0e5e4494edd9eb7f73024acf2dbfff0 (diff) |
Merge branch 'stable-3.1'v3.2.0-rc3
* stable-3.1:
Fix firing pending "..all.." events on startup
Do not block ref-updates during the configuration reload
Change-Id: I576ce713fe266caefeb150e3b889e6b254a92725
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java index d869e83..b58a1ff 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java @@ -139,7 +139,7 @@ public class DestinationsCollection implements ReplicationDestinations { } @Override - public synchronized List<Destination> getAll(FilterType filterType) { + public List<Destination> getAll(FilterType filterType) { Predicate<? super Destination> filter; switch (filterType) { case PROJECT_CREATION: @@ -157,7 +157,7 @@ public class DestinationsCollection implements ReplicationDestinations { } @Override - public synchronized boolean isEmpty() { + public boolean isEmpty() { return destinations.isEmpty(); } |