[jbosscache-commits] JBoss Cache SVN: r5711 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-04-28 05:18:41 -0400 (Mon, 28 Apr 2008)
New Revision: 5711

Modified:
   core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
Log:
Fixed data gravitation cleanup

Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java	2008-04-28 08:16:36 UTC (rev 5710)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java	2008-04-28 09:18:41 UTC (rev 5711)
@@ -68,13 +68,8 @@
       this.cacheData = cacheData;
    }
 
-   public Object perform(InvocationContext ctx)
+   public Object perform(InvocationContext ctx) throws Throwable
    {
-      throw new UnsupportedOperationException("Direct commands are not meant to be passed up the interceptor chain!");
-   }
-
-   public Object performDirectly() throws Throwable
-   {
       if (buddyManager.isDataGravitationRemoveOnFind())
       {
          if (trace)

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java	2008-04-28 08:16:36 UTC (rev 5710)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java	2008-04-28 09:18:41 UTC (rev 5711)
@@ -76,14 +76,14 @@
       // cleanup
       for (int i = 0; i < 3; i++) loaders[i].remove(Fqn.ROOT);
 
-      for (int i = 0; i < 3; i++) System.out.println(i + ": " + loaders[i].get(fqn));
+      for (int i = 0; i < 3; i++) System.out.println("Loader " + i + ": " + loaders[i].get(fqn));
 
       // put stuff in cache0
       caches.get(0).put(fqn, key, value);
 
       // make sure there are no locks.
       assertNoLocks(caches);
-      for (int i = 0; i < 3; i++) System.out.println(i + ": " + loaders[i].get(fqn));
+      for (int i = 0; i < 3; i++) System.out.println("Loader " + i + ": " + loaders[i].get(fqn));
 
       dumpCacheContents(caches);
 
@@ -93,10 +93,10 @@
 
       // should cause a gravitation event
       assertEquals(value, caches.get(2).get(fqn, key));
-      cleanupDelay(); // gravitation is async!!
+      cleanupDelay(); // gravitation cleanup is async!!
       assertNoLocks(caches);
 
-      for (int i = 0; i < 3; i++) System.out.println(i + ": " + loaders[i].get(fqn));
+      for (int i = 0; i < 3; i++) System.out.println("Loader " + i + ": " + loaders[i].get(fqn));
 
       dumpCacheContents(caches);