Fixed case with statsTrackingStore not being wrapped around properly

with DynamicTimeoutStoreClient since ser. and compression were disabled
up1 · Jun 18, 2013 · f23d03b · f23d03b
1 parent d90118f
commit f23d03b
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/src/java/voldemort/client/AbstractStoreClientFactory.java b/src/java/voldemort/client/AbstractStoreClientFactory.java
@@ -106,7 +106,6 @@ public abstract class AbstractStoreClientFactory implements StoreClientFactory {
     private final HashSet<SchedulerService> clientAsyncServiceRepo;
 
     private Cluster cluster;
-    private List<StoreDefinition> storeDefs;
 
     public AbstractStoreClientFactory(ClientConfig config) {
         this.config = config;
@@ -222,7 +221,8 @@ public <K, V, T> Store<K, V, T> getRawStore(String storeName,
             logger.debug("Obtained stores  metadata xml" + storesXml);
         }
 
-        storeDefs = storeMapper.readStoreList(new StringReader(storesXml), false);
+        List<StoreDefinition> storeDefs = storeMapper.readStoreList(new StringReader(storesXml),
+                                                                    false);
         StoreDefinition storeDef = null;
         for(StoreDefinition d: storeDefs)
             if(d.getName().equals(storeName))
@@ -297,12 +297,10 @@ public <K, V, T> Store<K, V, T> getRawStore(String storeName,
 
         store = new LoggingStore(store);
 
-        Store<K, V, T> finalStore = (Store<K, V, T>) store;
-
         if(isJmxEnabled) {
-            StatTrackingStore statStore = new StatTrackingStore(store, this.stats);
-            store = statStore;
-            JmxUtils.registerMbean(new StoreStatsJmx(statStore.getStats()),
+            store = new StatTrackingStore(store, this.stats);
+            // store = statStore;
+            JmxUtils.registerMbean(new StoreStatsJmx(((StatTrackingStore) store).getStats()),
                                    JmxUtils.createObjectName(JmxUtils.getPackageName(store.getClass()),
                                                              store.getName()
                                                                      + JmxUtils.getJmxId(jmxId)));
@@ -317,6 +315,8 @@ public <K, V, T> Store<K, V, T> getRawStore(String storeName,
             }
         }
 
+        Store<K, V, T> finalStore = (Store<K, V, T>) store;
+
         if(this.config.isEnableSerializationLayer()) {
             Serializer<K> keySerializer = (Serializer<K>) serializerFactory.getSerializer(storeDef.getKeySerializer());
             Serializer<V> valueSerializer = (Serializer<V>) serializerFactory.getSerializer(storeDef.getValueSerializer());
@@ -536,12 +536,4 @@ private void stopClientAsyncSchedulers() {
     protected String getClientContext() {
         return clientContextName;
     }
-
-    public Cluster getCluster() {
-        return cluster;
-    }
-
-    public List<StoreDefinition> getStoreDefs() {
-        return storeDefs;
-    }
 }