[exo-jcr-commits] exo-jcr SVN: r1296 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-01-05 09:53:40 -0500 (Tue, 05 Jan 2010)
New Revision: 1296

Modified:
   jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ExoEvictionActionPolicy.java
Log:
EXOJCR-333 : The ExoEvictionActionPolicy was changed.

Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ExoEvictionActionPolicy.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ExoEvictionActionPolicy.java	2010-01-05 14:42:11 UTC (rev 1295)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ExoEvictionActionPolicy.java	2010-01-05 14:53:40 UTC (rev 1296)
@@ -30,7 +30,8 @@
  * @author <a href="mailto:alex.reshetnyak at exoplatform.com.ua">Alex Reshetnyak</a> 
  * @version $Id$
  */
-public class ExoEvictionActionPolicy implements EvictionActionPolicy
+public class ExoEvictionActionPolicy
+   implements EvictionActionPolicy
 {
    private static final Log LOG = ExoLogger.getLogger("jcr.ExoEvictionActionPolicy");
 
@@ -42,18 +43,10 @@
    public boolean evict(Fqn fqn)
    {
 
-      if (fqn.size() != 3)
+      if (fqn.size() == 3 && (JBossCacheWorkspaceStorageCache.CHILD_NODES_LIST.equals(fqn.get(0)) || JBossCacheWorkspaceStorageCache.CHILD_PROPS_LIST.equals(fqn.get(0))))
       {
-         return eviction(fqn);
-      }
-      else if (fqn.size() == 3 && JBossCacheWorkspaceStorageCache.CHILD_NODES_LIST.equals(fqn.get(0)))
-      {
          return eviction(fqn.getParent());
       }
-      else if (fqn.size() == 3 && JBossCacheWorkspaceStorageCache.CHILD_PROPS_LIST.equals(fqn.get(0)))
-      {
-         return eviction(fqn.getParent());
-      } 
       else
       {
          return eviction(fqn);