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

[Manik Surtani]

  User: msurtani
  Date: 07/07/13 10:53:02

  Modified:    src/org/jboss/cache/interceptors  ActivationInterceptor.java
  Log:
  JBCACHE-486
  
  Revision  Changes    Path
  1.61      +12 -18    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.60
  retrieving revision 1.61
  diff -u -b -r1.60 -r1.61
  --- ActivationInterceptor.java	13 Jul 2007 14:31:42 -0000	1.60
  +++ ActivationInterceptor.java	13 Jul 2007 14:53:02 -0000	1.61
  @@ -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.60 2007/07/13 14:31:42 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.61 2007/07/13 14:53:02 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -139,9 +139,7 @@
               break;
         }
   
  -      // synchronizations now handled in the cache loader implementation
  -//      synchronized (this)
  -//      {
  +      NodeSPI n;
         if (fqn != null)
         {
            if (nodeRemoved)
  @@ -154,16 +152,14 @@
               log.trace("This is a remove data operation; removing the data from the loader, no activation processing needed.");
               loader.removeData(fqn);
            }
  -         else if (cache.peek(fqn, false) != null && loader.exists(fqn))
  +         else if (((n = getNode(fqn)) != null) && n.isDataLoaded())
            {
               // Remove the node from the cache loader if it exists in memory,
               // its attributes have been initialized, its children have been loaded,
               // AND it was found in the cache loader (nodeLoaded = true).
               // Then notify the listeners that the node has been activated.
  -            NodeSPI n = getNode(fqn);// don't load
  +
               // node not null and attributes have been loaded?
  -            if (n != null && n.isDataLoaded())
  -            {
                  if (!n.getChildrenDirect().isEmpty())
                  {
                     if (allInitialized(n))
  @@ -179,8 +175,6 @@
                  }
               }
            }
  -      }
  -//      }
         return retval;
      }