You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/10/13 17:52:13 UTC
svn commit: r1631444 -
/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: thelabdude
Date: Mon Oct 13 15:52:12 2014
New Revision: 1631444
URL: http://svn.apache.org/r1631444
Log:
SOLR-6511: fix back compat issue when reading existing data from ZK
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1631444&r1=1631443&r2=1631444&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Mon Oct 13 15:52:12 2014
@@ -1989,8 +1989,18 @@ public final class ZkController {
}
Map<String,Object> stateObj = null;
- if (stateData != null && stateData.length > 0)
- stateObj = (Map<String, Object>) ZkStateReader.fromJSON(stateData);
+ if (stateData != null && stateData.length > 0) {
+ Object parsedJson = ZkStateReader.fromJSON(stateData);
+ if (parsedJson instanceof Map) {
+ stateObj = (Map<String,Object>)parsedJson;
+ } else if (parsedJson instanceof String) {
+ // old format still in ZK
+ stateObj = new LinkedHashMap<>();
+ stateObj.put("state", (String)parsedJson);
+ } else {
+ throw new SolrException(ErrorCode.SERVER_ERROR, "Leader-initiated recovery state data is invalid! "+parsedJson);
+ }
+ }
return stateObj;
}