svn commit: r1044546 - in /cassandra: branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[brandonwilliams]

Author: brandonwilliams
Date: Sat Dec 11 00:06:24 2010
New Revision: 1044546

URL: http://svn.apache.org/viewvc?rev=1044546&view=rev
Log:
Unregister index Mbeans upon deletion.  Patch by Jon Hermes, reviewed by 
brandonwilliams for CASSANDRA-1843

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1044546&r1=1044545&r2=1044546&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Sat Dec 11 00:06:24 2010
@@ -183,6 +183,7 @@ public class ColumnFamilyStore implement
                     logger.debug("index {} already removed; ignoring", 
FBUtilities.bytesToHex(indexName));
                     continue;
                 }
+                indexCfs.unregisterMBean();
                 SystemTable.setIndexRemoved(metadata.tableName, 
metadata.cfName);
                 indexCfs.removeAllSSTables();
             }

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1044546&r1=1044545&r2=1044546&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Sat 
Dec 11 00:06:24 2010
@@ -183,6 +183,7 @@ public class ColumnFamilyStore implement
                     logger.debug("index {} already removed; ignoring", 
FBUtilities.bytesToHex(indexName));
                     continue;
                 }
+                indexCfs.unregisterMBean();
                 SystemTable.setIndexRemoved(metadata.tableName, 
metadata.cfName);
                 indexCfs.removeAllSSTables();
             }