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 2013/02/27 16:02:36 UTC
svn commit: r1450795 - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Author: markrmiller
Date: Wed Feb 27 15:02:36 2013
New Revision: 1450795
URL: http://svn.apache.org/r1450795
Log:
cleanup
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1450795&r1=1450794&r2=1450795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Wed Feb 27 15:02:36 2013
@@ -413,6 +413,10 @@ public class SolrDispatchFilter implemen
slices.addAll(clusterState.getSlices(collection));
}
}
+
+ if (slices == null || slices.size() == 0) {
+ return null;
+ }
Set<String> liveNodes = clusterState.getLiveNodes();
Iterator<Slice> it = slices.iterator();
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1450795&r1=1450794&r2=1450795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Wed Feb 27 15:02:36 2013
@@ -167,7 +167,7 @@ public class ClusterState implements JSO
* @param coreNodeName in the form of nodeName_coreName (the name of the replica)
*/
public String getShardId(String coreNodeName) {
- System.out.println("###### getShardId("+coreNodeName+") in " + collectionStates);
+ // System.out.println("###### getShardId("+coreNodeName+") in " + collectionStates);
for (DocCollection coll : collectionStates.values()) {
for (Slice slice : coll.getSlices()) {
if (slice.getReplicasMap().containsKey(coreNodeName)) return slice.getName();