Author: markrmiller
Date: Thu Feb 4 18:18:09 2010
New Revision: 906593
URL: http://svn.apache.org/viewvc?rev=906593&view=rev
Log:
better error if config file from zk has no data
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=906593&r1=906592&r2=906593&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
Thu Feb 4 18:18:09 2010
@@ -218,7 +218,15 @@
*/
public byte[] getConfigFileData(String zkConfigName, String fileName)
throws KeeperException, InterruptedException {
- return zkClient.getData(CONFIGS_ZKNODE + "/" + zkConfigName + "/" +
fileName, null, null);
+ String zkPath = CONFIGS_ZKNODE + "/" + zkConfigName + "/" + fileName;
+ byte[] bytes = zkClient.getData(zkPath, null, null);
+ if (bytes == null) {
+ log.error("Config file contains no data:" + zkPath);
+ throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
+ "Config file contains no data:" + zkPath);
+ }
+
+ return bytes;
}
// TODO: consider how this is done
