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

[Manik Surtani]

  User: msurtani
  Date: 07/07/16 22:03:26

  Modified:    src/org/jboss/cache/interceptors  
                        CacheLoaderInterceptor.java
                        ActivationInterceptor.java
  Log:
  refactored tests
  
  Revision  Changes    Path
  1.91      +2 -2      JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -b -r1.90 -r1.91
  --- CacheLoaderInterceptor.java	16 Jul 2007 23:43:37 -0000	1.90
  +++ CacheLoaderInterceptor.java	17 Jul 2007 02:03:26 -0000	1.91
  @@ -25,7 +25,7 @@
    * Loads nodes that don't exist at the time of the call into memory from the CacheLoader
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderInterceptor.java,v 1.90 2007/07/16 23:43:37 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.91 2007/07/17 02:03:26 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends Interceptor implements CacheLoaderInterceptorMBean
   {
  @@ -117,9 +117,9 @@
               acquireLock = true;
               break;
            case MethodDeclarations.getNodeMethodLocal_id:
  +         case MethodDeclarations.getChildrenNamesMethodLocal_id:
               bypassLoadingData = true;
            case MethodDeclarations.getKeysMethodLocal_id:
  -         case MethodDeclarations.getChildrenNamesMethodLocal_id:
            case MethodDeclarations.releaseAllLocksMethodLocal_id:
            case MethodDeclarations.printMethodLocal_id:
               fqn = (Fqn) args[0];
  
  
  
  1.62      +2 -4      JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActivationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -b -r1.61 -r1.62
  --- ActivationInterceptor.java	13 Jul 2007 14:53:02 -0000	1.61
  +++ ActivationInterceptor.java	17 Jul 2007 02:03:26 -0000	1.62
  @@ -26,7 +26,7 @@
    * their attributes have been initialized and their children have been loaded in memory.
    *
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: ActivationInterceptor.java,v 1.61 2007/07/13 14:53:02 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.62 2007/07/17 02:03:26 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -107,8 +107,6 @@
            }
         }
   
  -      // if we're here then it's not transactional
  -
         // CacheLoaderInterceptor normally doesn't load the node
         // since CacheStoreInterceptor.put() returns the old value
         switch (m.getMethodId())
  @@ -152,7 +150,7 @@
               log.trace("This is a remove data operation; removing the data from the loader, no activation processing needed.");
               loader.removeData(fqn);
            }
  -         else if (((n = getNode(fqn)) != null) && n.isDataLoaded())
  +         else if (((n = getNode(fqn)) != null) && n.isDataLoaded() && loader.exists(fqn))
            {
               // Remove the node from the cache loader if it exists in memory,
               // its attributes have been initialized, its children have been loaded,