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

[Manik Surtani]

  User: msurtani
  Date: 07/05/30 07:35:14

  Modified:    src/org/jboss/cache/interceptors   
                        PassivationInterceptor.java
                        ActivationInterceptor.java
                        CacheLoaderInterceptor.java
  Log:
  JBCACHE-1073
  
  Revision  Changes    Path
  1.42      +4 -3      JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- PassivationInterceptor.java	23 May 2007 15:22:03 -0000	1.41
  +++ PassivationInterceptor.java	30 May 2007 11:35:14 -0000	1.42
  @@ -8,6 +8,7 @@
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodDeclarations;
   
  +import java.util.Collections;
   import java.util.HashMap;
   import java.util.Map;
   import java.util.concurrent.atomic.AtomicLong;
  @@ -17,7 +18,7 @@
    * CacheLoader, either before each method call (no TXs), or at TX commit.
    *
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: PassivationInterceptor.java,v 1.41 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: PassivationInterceptor.java,v 1.42 2007/05/30 11:35:14 msurtani Exp $
    */
   public class PassivationInterceptor extends Interceptor implements PassivationInterceptorMBean
   {
  @@ -58,11 +59,11 @@
                  // to get them manually
                  Map attributes = getNodeAttributes(fqn);
                  // notify listeners that this node is about to be passivated
  -               cache.getNotifier().notifyNodePassivated(fqn, true, ctx, true);
  +               cache.getNotifier().notifyNodePassivated(fqn, true, attributes, ctx, true);
   
                  loader.put(fqn, attributes);
   
  -               cache.getNotifier().notifyNodePassivated(fqn, false, ctx, true);
  +               cache.getNotifier().notifyNodePassivated(fqn, false, Collections.emptyMap(), ctx, true);
               }
   
               if (getStatisticsEnabled() && configuration.getExposeManagementStatistics())
  
  
  
  1.55      +3 -3      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.54
  retrieving revision 1.55
  diff -u -b -r1.54 -r1.55
  --- ActivationInterceptor.java	23 May 2007 15:22:03 -0000	1.54
  +++ ActivationInterceptor.java	30 May 2007 11:35:14 -0000	1.55
  @@ -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.54 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.55 2007/05/30 11:35:14 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -185,7 +185,7 @@
   
      private void remove(InvocationContext ctx, Fqn fqn) throws Exception
      {
  -      cache.getNotifier().notifyNodeActivated(fqn, true, ctx, true);
  +      cache.getNotifier().notifyNodeActivated(fqn, true, blahDeBlah, ctx, true);
         loader.remove(fqn);
         if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
         {
  @@ -346,7 +346,7 @@
      {
         Modification mod = new Modification(Modification.ModificationType.REMOVE_NODE, fqn);
         l.add(mod);
  -      cache.getNotifier().notifyNodeActivated(fqn, false, ctx, true);
  +      cache.getNotifier().notifyNodeActivated(fqn, false, blahDeBlah, ctx, true);
      }
   
   }
  
  
  
  1.81      +5 -5      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.80
  retrieving revision 1.81
  diff -u -b -r1.80 -r1.81
  --- CacheLoaderInterceptor.java	23 May 2007 15:22:03 -0000	1.80
  +++ CacheLoaderInterceptor.java	30 May 2007 11:35:14 -0000	1.81
  @@ -24,7 +24,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.80 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.81 2007/05/30 11:35:14 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
   {
  @@ -397,7 +397,7 @@
            cache.getNotifier().notifyNodeLoaded(fqn, true, Collections.emptyMap(), ctx, true);
            if (isActivation)
            {
  -            cache.getNotifier().notifyNodeActivated(fqn, true, ctx, true);
  +            cache.getNotifier().notifyNodeActivated(fqn, true, Collections.emptyMap(), ctx, true);
            }
   
            n = createNodes(fqn, entry);
  @@ -407,7 +407,7 @@
            cache.getNotifier().notifyNodeLoaded(fqn, false, nodeData, ctx, true);
            if (isActivation)
            {
  -            cache.getNotifier().notifyNodeActivated(fqn, false, ctx, true);
  +            cache.getNotifier().notifyNodeActivated(fqn, false, nodeData, ctx, true);
            }
         }