You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/29 12:11:59 UTC
[lucene-solr] 04/22: @607 Clean up listener synchronization.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit b3aed82b36986fe6c41d6b16e45f79ad78525d14
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Aug 28 09:33:42 2020 -0500
@607 Clean up listener synchronization.
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index be84376..57fbc66 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2500,8 +2500,7 @@ public class ZkController implements Closeable {
public void addOnReconnectListener(OnReconnect listener) {
if (listener != null) {
reconnectListeners.add(listener);
- log.debug("Added new OnReconnect listener {}", listener);
-
+ if (log.isDebugEnabled()) log.debug("Added new OnReconnect listener {}", listener);
}
}
@@ -2510,12 +2509,10 @@ public class ZkController implements Closeable {
*/
public void removeOnReconnectListener(OnReconnect listener) {
if (listener != null) {
- boolean wasRemoved;
- synchronized (reconnectListeners) {
- wasRemoved = reconnectListeners.remove(listener);
- }
+ boolean wasRemoved = reconnectListeners.remove(listener);
+
if (wasRemoved) {
- log.debug("Removed OnReconnect listener {}", listener);
+ if (log.isDebugEnabled()) log.debug("Removed OnReconnect listener {}", listener);
} else {
log.warn("Was asked to remove OnReconnect listener {}, but remove operation " +
"did not find it in the list of registered listeners."
@@ -2525,8 +2522,7 @@ public class ZkController implements Closeable {
}
Set<OnReconnect> getCurrentOnReconnectListeners() {
- Set<OnReconnect> clonedListeners = new HashSet<>(reconnectListeners);
- return clonedListeners;
+ return Collections.unmodifiableSet(reconnectListeners);
}
/**