You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/10/15 14:51:33 UTC
svn commit: r1532318 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/solrj/
solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Author: shalin
Date: Tue Oct 15 12:51:33 2013
New Revision: 1532318
URL: http://svn.apache.org/r1532318
Log:
SOLR-5349: CloudSolrServer - ZK timeout arguments passed to ZkStateReader are flipped
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1532318&r1=1532317&r2=1532318&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Oct 15 12:51:33 2013
@@ -152,6 +152,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
----------------------
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1532318&r1=1532317&r2=1532318&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Tue Oct 15 12:51:33 2013
@@ -224,8 +224,8 @@ public class CloudSolrServer extends Sol
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) {