svn commit: r992132 - in /cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/tools/NodeCmd.java src/java/org/apache/cassandra/tools/NodeProbe.java

[jbellis]

Author: jbellis
Date: Thu Sep  2 22:21:13 2010
New Revision: 992132

URL: http://svn.apache.org/viewvc?rev=992132&view=rev
Log:
fix ColumnFamilyStoreMBeanIterator to use new type name.  patch by jbellis; 
reviewed by gdusbabek for CASSANDRA-1433

Modified:
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=992132&r1=992131&r2=992132&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Sep  2 22:21:13 2010
@@ -40,6 +40,7 @@ dev
  * handle zero-length (or missing) rows during HH paging (CASSANDRA-1432)
  * include secondary indexes during schema migrations (CASSANDRA-1406)
  * fix commitlog header race during schema change (CASSANDRA-1435)
+ * fix ColumnFamilyStoreMBeanIterator to use new type name (CASSANDRA-1433)
 
 
 0.7-beta1

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=992132&r1=992131&r2=992132&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Thu Sep  2 
22:21:13 2010
@@ -248,9 +248,9 @@ public class NodeCmd {
         // get a list of column family stores
         Iterator<Map.Entry<String, ColumnFamilyStoreMBean>> cfamilies = 
probe.getColumnFamilyStoreMBeanProxies();
 
-        for (;cfamilies.hasNext();)
+        while (cfamilies.hasNext())
         {
-            Map.Entry<String, ColumnFamilyStoreMBean> entry = cfamilies.next();
+            Entry<String, ColumnFamilyStoreMBean> entry = cfamilies.next();
             String tableName = entry.getKey();
             ColumnFamilyStoreMBean cfsProxy = entry.getValue();
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=992132&r1=992131&r2=992132&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Thu Sep  
2 22:21:13 2010
@@ -425,7 +425,7 @@ class ColumnFamilyStoreMBeanIterator imp
     public ColumnFamilyStoreMBeanIterator(MBeanServerConnection 
mbeanServerConn)
     throws MalformedObjectNameException, NullPointerException, IOException
     {
-        ObjectName query = new 
ObjectName("org.apache.cassandra.db:type=ColumnFamilyStores,*");
+        ObjectName query = new 
ObjectName("org.apache.cassandra.db:type=ColumnFamilies,*");
         resIter = mbeanServerConn.queryNames(query, null).iterator();
         this.mbeanServerConn = mbeanServerConn;
     }