From d91c24993b4bb94ef03a4f9a1e9962040bc14494 Mon Sep 17 00:00:00 2001
From: Chinmay Soman <csoman@linkedin.com>
Date: Fri, 17 May 2013 15:35:13 -0700
Subject: [PATCH] Adding a null check for the versioned value object in
 convertStringToObject in MetadataStore. This was causing a small problem
 while restarting the Voldemort server

---
 src/java/voldemort/store/metadata/MetadataStore.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java/voldemort/store/metadata/MetadataStore.java b/src/java/voldemort/store/metadata/MetadataStore.java
index ac0aea7be0..743a547634 100644
--- a/src/java/voldemort/store/metadata/MetadataStore.java
+++ b/src/java/voldemort/store/metadata/MetadataStore.java
@@ -798,7 +798,9 @@ private Versioned<Object> convertStringToObject(String key, Versioned<String> va
                 valueObject = clusterMapper.readCluster(new StringReader(value.getValue()));
             }
         } else if(REBALANCING_SOURCE_STORES_XML.equals(key)) {
-            valueObject = storeMapper.readStoreList(new StringReader(value.getValue()));
+            if(value.getValue() != null && value.getValue().length() > 0) {
+                valueObject = storeMapper.readStoreList(new StringReader(value.getValue()));
+            }
         } else {
             throw new VoldemortException("Unhandled key:'" + key
                                          + "' for String to Object serialization.");