You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/17 05:19:23 UTC
lucene-solr:jira/solr-11702: SOLR-11702: ZkController should
synchronize collectionToTerms on close
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 ad756efb0 -> fcf51a97c
SOLR-11702: ZkController should synchronize collectionToTerms on close
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fcf51a97
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fcf51a97
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fcf51a97
Branch: refs/heads/jira/solr-11702
Commit: fcf51a97c10fa5be1d3a101dd623c10f77ee0125
Parents: ad756ef
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Jan 17 12:19:08 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Jan 17 12:19:08 2018 +0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fcf51a97/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
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 ab9a224..0db9bc9 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -547,7 +547,9 @@ public class ZkController {
*/
public void close() {
this.isClosed = true;
- collectionToTerms.values().forEach(ZkCollectionTerms::close);
+ synchronized (collectionToTerms) {
+ collectionToTerms.values().forEach(ZkCollectionTerms::close);
+ }
try {
for (ElectionContext context : electionContexts.values()) {
try {