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 2015/03/25 20:58:18 UTC
svn commit: r1669215 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Author: shaie
Date: Wed Mar 25 19:58:18 2015
New Revision: 1669215
URL: http://svn.apache.org/r1669215
Log:
check coll==null in CollectionRef.toString()
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1669215&r1=1669214&r2=1669215&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Wed Mar 25 19:58:18 2015
@@ -228,7 +228,7 @@ public class ClusterState implements JSO
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("live nodes:" + liveNodes);
- sb.append(" collections:" + collectionStates);
+ sb.append("collections:" + collectionStates);
return sb.toString();
}
@@ -394,7 +394,11 @@ public class ClusterState implements JSO
@Override
public String toString() {
- return coll.toString();
+ if (coll != null) {
+ return coll.toString();
+ } else {
+ return "null DocCollection ref";
+ }
}
}