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 A141E17870 for ; Mon, 13 Oct 2014 15:56:06 +0000 (UTC) Received: (qmail 44355 invoked by uid 500); 13 Oct 2014 15:56: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 44345 invoked by uid 99); 13 Oct 2014 15:56:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2014 15:56:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 13 Oct 2014 15:56:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 17DCB23889BB; Mon, 13 Oct 2014 15:55:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1631447 - /lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java Date: Mon, 13 Oct 2014 15:55:45 -0000 To: commits@lucene.apache.org From: thelabdude@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141013155545.17DCB23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thelabdude Date: Mon Oct 13 15:55:44 2014 New Revision: 1631447 URL: http://svn.apache.org/r1631447 Log: SOLR-6511: fix back compat issue when reading existing data from ZK Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1631447&r1=1631446&r2=1631447&view=diff ============================================================================== --- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original) +++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/ZkController.java Mon Oct 13 15:55:44 2014 @@ -1921,8 +1921,18 @@ public final class ZkController { } Map stateObj = null; - if (stateData != null && stateData.length > 0) - stateObj = (Map) ZkStateReader.fromJSON(stateData); + if (stateData != null && stateData.length > 0) { + Object parsedJson = ZkStateReader.fromJSON(stateData); + if (parsedJson instanceof Map) { + stateObj = (Map)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; }