Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5349: CloudSolrServer - ZK timeout arguments passed to ZkStateReader are flipped 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1532314 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2013-10-15 12:47:42 +00:00
parent 9e258d224d
commit e572dce1e5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -186,6 +186,9 @@ Bug Fixes
* SOLR-4327: HttpSolrServer can leak connections on errors. (Karl Wright, Mark Miller)
* SOLR-5349: CloudSolrServer - ZK timeout arguments passed to ZkStateReader are flipped.
(Ricardo Merizalde via shalin)
Other Changes
----------------------

4
solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
View File

@ -224,8 +224,8 @@ public class CloudSolrServer extends SolrServer {
synchronized (this) {
if (zkStateReader == null) {
try {
ZkStateReader zk = new ZkStateReader(zkHost, zkConnectTimeout,
zkClientTimeout);
ZkStateReader zk = new ZkStateReader(zkHost, zkClientTimeout,
zkConnectTimeout);
zk.createClusterStateWatchersAndUpdate();
zkStateReader = zk;
} catch (InterruptedException e) {