[jbosscache-commits] JBoss Cache SVN: r6238 - in core/trunk/src: main/java/org/jboss/cache/interceptors and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-10 07:19:53 -0400 (Thu, 10 Jul 2008)
New Revision: 6238

Modified:
   core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java
   core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
Log:
Fixed passivation bug
Added better toString for EvictCommand

Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java	2008-07-10 10:51:38 UTC (rev 6237)
+++ core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java	2008-07-10 11:19:53 UTC (rev 6238)
@@ -187,7 +187,7 @@
    @Override
    public String toString()
    {
-      return "EvictCommand{" +
+      return getClass().getSimpleName() + "{" +
             "fqn=" + fqn +
             ", recursive=" + recursive +
             "}";

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java	2008-07-10 10:51:38 UTC (rev 6237)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java	2008-07-10 11:19:53 UTC (rev 6238)
@@ -46,16 +46,10 @@
    @Override
    public Object visitEvictFqnCommand(InvocationContext ctx, EvictCommand command) throws Throwable
    {
-      if (command.isRecursive())
+      List<Fqn> fqnsToEvict;
+      if (command.isRecursive() && (fqnsToEvict = command.getNodesToEvict()) != null && !fqnsToEvict.isEmpty())
       {
-         List<Fqn> fqnsToEvict = command.getNodesToEvict();
-         if (fqnsToEvict != null)
-         {
-            for (Fqn f : fqnsToEvict)
-            {
-               passivate(ctx, f);
-            }
-         }
+         for (Fqn f : fqnsToEvict) passivate(ctx, f);
       }
       else
       {

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java	2008-07-10 10:51:38 UTC (rev 6237)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java	2008-07-10 11:19:53 UTC (rev 6238)
@@ -101,7 +101,7 @@
    {
       final Fqn NODE = Fqn.fromString("/test");
       final String KEY = "key";
-      Object retval = null;
+      Object retval;
       cache.removeNode(NODE);// nothing to remove
       addDelay();
       retval = cache.put(NODE, KEY, 10);// put in memory
@@ -111,13 +111,12 @@
       assertEquals(10, retval);// get from memory
       cache.evict(NODE, true);// passivate node
       addDelay();
-      log.debug("______________");
       retval = cache.put(NODE, KEY, 30);// activate node then does put in memory
       assertFalse(loader.exists(NODE));
       assertEquals(20, retval);
    }
 
-   public void testPut2Passivation() throws CacheException
+   public void testPut2Passivation() throws Exception
    {
       final Fqn NODE = Fqn.fromString("/a/b/c");
       final String KEY = "key";
@@ -133,23 +132,9 @@
       cache.evict(Fqn.fromString("/a/b"), true);// passivate parent node
       cache.evict(Fqn.fromString("/a"), true);// passivate parent node
       addDelay();
-      try
-      {
-         assertTrue(loader.exists(Fqn.fromString("/a/b/c")));
-      }
-      catch (Exception e)
-      {
-         fail(e.toString());
-      }
+      assertTrue(loader.exists(Fqn.fromString("/a/b/c")));
       retval = cache.put(NODE, KEY, 30);// activate node, put in memory new value
-      try
-      {
-         assertFalse(loader.exists(NODE));
-      }
-      catch (Exception e)
-      {
-         fail(e.toString());
-      }
+      assertFalse(loader.exists(NODE));
       assertEquals(20, retval);
    }