svn commit: r916974 - in /incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra: cache/JMXAggregatingCacheMBean.java tools/NodeProbe.java

[jbellis]

Author: jbellis
Date: Sat Feb 27 15:41:23 2010
New Revision: 916974

URL: http://svn.apache.org/viewvc?rev=916974&view=rev
Log:
fix nodeprobe compilation problem introduced by #801 patches.  patch by jbellis

Removed:
    
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cache/JMXAggregatingCacheMBean.java
Modified:
    
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java

Modified: 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=916974&r1=916973&r2=916974&view=diff
==============================================================================
--- 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
 (original)
+++ 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
 Sat Feb 27 15:41:23 2010
@@ -39,7 +39,6 @@
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
-import org.apache.cassandra.cache.JMXAggregatingCacheMBean;
 import org.apache.cassandra.cache.JMXInstrumentedCacheMBean;
 import org.apache.cassandra.concurrent.IExecutorMBean;
 import org.apache.cassandra.db.ColumnFamilyStoreMBean;
@@ -251,12 +250,12 @@
         }
     }
 
-    public JMXAggregatingCacheMBean getKeyCacheMBean(String tableName, String 
cfName)
+    public JMXInstrumentedCacheMBean getKeyCacheMBean(String tableName, String 
cfName)
     {
         String keyCachePath = "org.apache.cassandra.db:type=Caches,keyspace=" 
+ tableName + ",cache=" + cfName + "KeyCache";
         try
         {
-            return JMX.newMBeanProxy(mbeanServerConn, new 
ObjectName(keyCachePath), JMXAggregatingCacheMBean.class);
+            return JMX.newMBeanProxy(mbeanServerConn, new 
ObjectName(keyCachePath), JMXInstrumentedCacheMBean.class);
         }
         catch (MalformedObjectNameException e)
         {
@@ -387,7 +386,7 @@
         try
         {
             String keyCachePath = 
"org.apache.cassandra.db:type=Caches,keyspace=" + tableName + ",cache=" + 
cfName + "KeyCache";
-            JMXAggregatingCacheMBean keyCacheMBean = 
JMX.newMBeanProxy(mbeanServerConn, new ObjectName(keyCachePath), 
JMXAggregatingCacheMBean.class);
+            JMXInstrumentedCacheMBean keyCacheMBean = 
JMX.newMBeanProxy(mbeanServerConn, new ObjectName(keyCachePath), 
JMXInstrumentedCacheMBean.class);
             keyCacheMBean.setCapacity(keyCacheCapacity);
 
             String rowCachePath = 
"org.apache.cassandra.db:type=Caches,keyspace=" + tableName + ",cache=" + 
cfName + "RowCache";