Return-Path: 
 <solr-commits-return-6327-apmail-lucene-solr-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org
Received: (qmail 79430 invoked from network); 23 Jan 2010 15:03:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Jan 2010 15:03:02 -0000
Received: (qmail 31395 invoked by uid 500); 23 Jan 2010 15:03:02 -0000
Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org
Received: (qmail 31322 invoked by uid 500); 23 Jan 2010 15:03:02 -0000
Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:solr-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:solr-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:solr-commits@lucene.apache.org>
List-Id: <solr-commits.lucene.apache.org>
Reply-To: solr-dev@lucene.apache.org
Delivered-To: mailing list solr-commits@lucene.apache.org
Received: (qmail 31312 invoked by uid 99); 23 Jan 2010 15:03:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Jan 2010 15:03:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Jan 2010 15:03:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 61FE1238890A; Sat, 23 Jan 2010 15:02:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r902413 -
 /lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java
Date: Sat, 23 Jan 2010 15:02:41 -0000
To: solr-commits@lucene.apache.org
From: markrmiller@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100123150241.61FE1238890A@eris.apache.org>

Author: markrmiller
Date: Sat Jan 23 15:02:41 2010
New Revision: 902413

URL: http://svn.apache.org/viewvc?rev=902413&view=rev
Log:
improve error reporting when using missing collection

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java?rev=902413&r1=902412&r2=902413&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudState.java Sat Jan 23 15:02:41 2010
@@ -22,8 +22,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.solr.common.SolrException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 // effectively immutable
 public class CloudState {
+  protected static Logger log = LoggerFactory.getLogger(CloudState.class);
+  
   private Map<String,Map<String,Slice>> collectionStates = new HashMap<String,Map<String,Slice>>();
   private Set<String> liveNodes = null;
   
@@ -38,7 +44,13 @@
   
   // nocommit
   public Map<String,Slice> getSlices(String collection) {
-    return Collections.unmodifiableMap(collectionStates.get(collection));
+    Map<String,Slice> collectionState = collectionStates.get(collection);
+    if(collectionState == null) {
+      log.error("Could not find cloud state for collection:" + collection);
+      throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
+          "Could not find cloud state for collection:" + collection);
+    }
+    return Collections.unmodifiableMap(collectionState);
   }
   
   public Set<String> getLiveNodes() {