[jboss-cvs] JBossAS SVN: r65545 - branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2007-09-21 21:59:29 -0400 (Fri, 21 Sep 2007)
New Revision: 65545

Modified:
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheWrapper.java
Log:
[JBAS-4611] Just do a local-only remove instead of recursive evicts

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheWrapper.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheWrapper.java	2007-09-21 23:02:55 UTC (rev 65544)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheWrapper.java	2007-09-22 01:59:29 UTC (rev 65545)
@@ -243,25 +243,11 @@
       {
          try
          {
-            // Evict the node itself first, since if it stores a Pojo
-            // that will do everything
-            proxy_.evict(fqn);
-            
-            // next do a depth first removal; this ensure all nodes
-            // are removed, not just their data map
-            Set children = proxy_.getChildrenNames(fqn);
-            if (children != null)
-            {
-               for (Iterator it = children.iterator(); it.hasNext(); )
-               {
-                  Fqn child = new Fqn(fqn, it.next());
-                  proxy_.evict(child);
-               }
-               
-               proxy_.evict(fqn);
-            }
-            return;
-            
+            // Just do a local-only remove
+            Option option = new Option();
+            option.setCacheModeLocal(true);
+            proxy_.remove(fqn, option);
+            return;            
          }
          catch (TimeoutException e)
          {
@@ -269,12 +255,10 @@
          }
          catch (Exception e)
          {
-            throw new RuntimeException("JBossCacheService: exception occurred in cache evict ... ", e);
+            throw new RuntimeException("JBossCacheService: exception occurred in cache evictSubtree ... ", e);
          }
       }
       throw new RuntimeException("JBossCacheService: exception occurred in cache evictSubtree after retry ... ", ex);
-      
-      
    }
 
 }