svn commit: r1199378 - /cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java

[jb...@apache.org]

Author: jbellis
Date: Tue Nov  8 18:29:54 2011
New Revision: 1199378

URL: http://svn.apache.org/viewvc?rev=1199378&view=rev
Log:
fix merge of #3437

Modified:
    cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java

Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java?rev=1199378&r1=1199377&r2=1199378&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java Tue Nov  8 18:29:54 2011
@@ -92,7 +92,7 @@ public class KeyCacheTest extends Cleanu
 
         // load the cache from disk.  unregister the old mbean so we can recreate a new CFS object.
         // but don't invalidate() the old CFS, which would nuke the data we want to try to load
-        store.invalidate(); // unregistering old MBean to test how key cache will be loaded
+        store.unregisterMBean();
         ColumnFamilyStore newStore = ColumnFamilyStore.createColumnFamilyStore(Table.open(TABLE1), COLUMN_FAMILY3);
         assertEquals(100, newStore.getKeyCacheSize());