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/09/01 13:05:54 UTC
[lucene-solr] 03/11: connect to ZK if not already connected
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 4833fe742aa73efb3d0e57120c3b847b2905aa32
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Mon Aug 31 14:21:54 2020 -0600
connect to ZK if not already connected
---
.../org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java | 2 +-
.../solr/client/solrj/impl/ZkClientClusterStateProvider.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
index 4f36751..573d30d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
@@ -67,7 +67,7 @@ public class CloudHttp2SolrClient extends BaseCloudSolrClient {
super(builder.shardLeadersOnly, builder.parallelUpdates, builder.directUpdatesToLeadersOnly);
this.clientIsInternal = builder.httpClient == null;
if (builder.stateProvider == null) {
- if ((builder.zkHosts != null && !builder.zkHosts.isEmpty()) && builder.solrUrls != null) {
+ if (builder.zkHosts != null && builder.zkHosts.size() > 0 && builder.solrUrls != null && builder.solrUrls.size() > 0) {
cleanupAfterInitError();
throw new IllegalArgumentException("Both zkHost(s) & solrUrl(s) have been specified. Only specify one.");
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
index 749b521..211b39f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.impl;
+import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.ParWork;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -163,15 +164,16 @@ public class ZkClientClusterStateProvider implements ClusterStateProvider {
}
public ZkStateReader getZkStateReader() {
+ if (isClosed) {
+ throw new AlreadyClosedException();
+ }
+
if (zkStateReader == null) {
- throw new IllegalStateException("Not connected to ZK! Did you call connect?");
- /*
synchronized (this) {
if (zkStateReader == null) {
connect();
}
}
- */
}
return zkStateReader;
}