[jboss-cvs] JBossCache/src/org/jboss/cache/aop/interceptors ...

[Manik Surtani]

  User: msurtani
  Date: 06/08/25 10:10:07

  Modified:    src/org/jboss/cache/aop/interceptors 
                        PojoEvictionInterceptor.java
  Log:
  More work on JBCACHE-734
  
  Revision  Changes    Path
  1.8       +13 -16    JBossCache/src/org/jboss/cache/aop/interceptors/PojoEvictionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoEvictionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/interceptors/PojoEvictionInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PojoEvictionInterceptor.java	25 Aug 2006 11:59:02 -0000	1.7
  +++ PojoEvictionInterceptor.java	25 Aug 2006 14:10:07 -0000	1.8
  @@ -13,7 +13,7 @@
   import org.jboss.cache.eviction.Region;
   import org.jboss.cache.interceptors.EvictionInterceptor;
   import org.jboss.cache.marshall.MethodDeclarations;
  -import org.jgroups.blocks.MethodCall;
  +import org.jboss.cache.marshall.MethodCall;
   
   import java.util.Iterator;
   import java.util.Set;
  @@ -35,27 +35,27 @@
   
         // now override the handler lookup map with AOP specific handlers.
         EvictionMethodHandler handler = new PojoGetNodeEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.getNodeMethodLocal, handler);
  -      evictionMethodHandlers.put(MethodDeclarations.getDataMapMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.getNodeMethodLocal_id, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.getDataMapMethodLocal_id, handler);
   
         handler = new PojoGetKeyEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.getKeyValueMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.getKeyValueMethodLocal_id, handler);
   
         handler = new PojoRemoveNodeEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.removeNodeMethodLocal, handler);
  -      evictionMethodHandlers.put(MethodDeclarations.removeDataMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.removeNodeMethodLocal_id, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.removeDataMethodLocal_id, handler);
   
         handler = new PojoRemoveKeyEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.removeKeyMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.removeKeyMethodLocal_id, handler);
   
         handler = new PojoPutDataEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.putDataMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.putDataMethodLocal_id, handler);
   
         handler = new PojoPutDataEraseEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.putDataEraseMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.putDataEraseMethodLocal_id, handler);
   
         handler = new PojoPutKeyEvictionMethodHandler();
  -      evictionMethodHandlers.put(MethodDeclarations.putKeyValMethodLocal, handler);
  +      evictionMethodHandlers.put(MethodDeclarations.putKeyValMethodLocal_id, handler);
      }
   
      public void setCache(CacheSPI cache)
  @@ -66,13 +66,10 @@
      boolean isAopNode(Fqn fqn)
      {
         // Use this API so it doesn't go thru the interceptor.
  -      DataNode node = null;
  +      DataNode node;
         node = cache.peek(fqn);
   
  -      if( node.get(AOPInstance.KEY) != null )
  -         return true;
  -      else
  -         return false;
  +       return node.get(AOPInstance.KEY) != null;
      }
   
      private void visitChildrenRecursively(Region region, Fqn fqn)
  @@ -84,7 +81,7 @@
         }
         catch (CacheException e)
         {
  -         e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
  +         log_.error("Caught error", e);
         }
         int size = (set == null) ? 0 : set.size();
         if (log_.isTraceEnabled())