Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 98D9417B88 for ; Wed, 25 Mar 2015 19:57:06 +0000 (UTC) Received: (qmail 94985 invoked by uid 500); 25 Mar 2015 19:57:06 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 94975 invoked by uid 99); 25 Mar 2015 19:57:06 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2015 19:57:06 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 4D1D9AC006C for ; Wed, 25 Mar 2015 19:57:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1669214 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Date: Wed, 25 Mar 2015 19:57:06 -0000 To: commits@lucene.apache.org From: shaie@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150325195706.4D1D9AC006C@hades.apache.org> Author: shaie Date: Wed Mar 25 19:57:05 2015 New Revision: 1669214 URL: http://svn.apache.org/r1669214 Log: check coll==null in CollectionRef.toString() Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java 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=1669214&r1=1669213&r2=1669214&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 Mar 25 19:57:05 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"; + } } }