[jboss-cvs] JBossAS SVN: r64870 - branches/JBoss_4_0_5_GA_CP07_JBAS-4611/tomcat/src/main/org/jboss/web/tomcat/tc5/session.

[jboss-cvs-commits at lists.jboss.org]

Author: jiwils
Date: 2007-08-24 19:09:01 -0400 (Fri, 24 Aug 2007)
New Revision: 64870

Modified:
   branches/JBoss_4_0_5_GA_CP07_JBAS-4611/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheWrapper.java
Log:
Fix for [JBAS-4611] using remove with a local option.

Modified: branches/JBoss_4_0_5_GA_CP07_JBAS-4611/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheWrapper.java
===================================================================
--- branches/JBoss_4_0_5_GA_CP07_JBAS-4611/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheWrapper.java	2007-08-24 22:22:49 UTC (rev 64869)
+++ branches/JBoss_4_0_5_GA_CP07_JBAS-4611/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheWrapper.java	2007-08-24 23:09:01 UTC (rev 64870)
@@ -243,29 +243,12 @@
       {
          try
          {
-            // Test fix for JBAS-4611.  The order of proxy_.evict and
-            // proxy_.getChildrenNames have been reversed on purpose.
-
-            // next do a depth first removal; this ensure all nodes
-            // are removed, not just their data map
-            Set children = proxy_.getChildrenNames(fqn);
-
-            // Evict the node itself first, since if it stores a Pojo
-            // that will do everything
-            proxy_.evict(fqn);
-
-            if (children != null)
-            {
-               for (Iterator it = children.iterator(); it.hasNext(); )
-               {
-                  Fqn child = new Fqn(fqn, it.next());
-                  proxy_.evict(child);
-               }
-
-               proxy_.evict(fqn);
-            }
+            // Test fix for JBAS-4611.  Using proxy_.remove with a local option instead of
+            // proxy_.evict.
+            Option option = new Option();
+            option.setCacheModeLocal(true);
+            proxy_.remove(fqn, option);
             return;
-
          }
          catch (TimeoutException e)
          {