lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1201703 - in /lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud: SolrZkClient.java ZkStateReader.java
Date Mon, 14 Nov 2011 13:49:49 GMT
Author: markrmiller
Date: Mon Nov 14 13:49:48 2011
New Revision: 1201703

URL: http://svn.apache.org/viewvc?rev=1201703&view=rev
Log:
rename clusterstate to clusterstate.xml

Modified:
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1201703&r1=1201702&r2=1201703&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
(original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Mon Nov 14 13:49:48 2011
@@ -431,7 +431,7 @@ public class SolrZkClient {
     if (data != null) {
       try {
         String dataString = new String(data, "UTF-8");
-        if (!path.endsWith(".txt") && !path.endsWith(".xml")) {
+        if ((!path.endsWith(".txt") && !path.endsWith(".xml")) || path.endsWith(ZkStateReader.CLUSTER_STATE))
{
           string.append(dent + "DATA:\n" + dent + "    "
               + dataString.replaceAll("\n", "\n" + dent + "    ") + NEWL);
         } else {

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1201703&r1=1201702&r2=1201703&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
(original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
Mon Nov 14 13:49:48 2011
@@ -41,7 +41,7 @@ public class ZkStateReader {
   public static final String NODE_NAME = "node_name";
   public static final String ROLES_PROP = "roles";
   public static final String LIVE_NODES_ZKNODE = "/live_nodes";
-  public static final String CLUSTER_STATE = "/clusterstate";
+  public static final String CLUSTER_STATE = "/clusterstate.xml";
   
   private volatile CloudState cloudState = new CloudState();
 



Mime
View raw message