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

[Manik Surtani]

  User: msurtani
  Date: 07/02/27 16:57:35

  Modified:    src/org/jboss/cache/factories  InterceptorChainFactory.java
  Log:
  JBCACHE-814
  
  Revision  Changes    Path
  1.39      +44 -43    JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorChainFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- InterceptorChainFactory.java	27 Feb 2007 17:27:44 -0000	1.38
  +++ InterceptorChainFactory.java	27 Feb 2007 21:57:35 -0000	1.39
  @@ -172,60 +172,59 @@
            addInterceptor(first, notificationInterceptor);
   
   
  -      if (first == null)
  -      {
  -         first = lock_interceptor;
  -      }
  -      else
  -      {
  -         addInterceptor(first, lock_interceptor);
  -      }
  -      
  -
  -
         // create the stack from the bottom up
  -      if (activation_interceptor != null)
  -      {
  -         if (!cacheLoaderMgr.isFetchPersistentState())
  -         {
  -            if (first == null)
  -            {
  -               first = passivation_interceptor;
  -            }
  -            else
  -            {
  -               addInterceptor(first, passivation_interceptor);
  -            }
  -         }
  -      }
  +//      if (activation_interceptor != null)
  +//      {
  +//         if (!cacheLoaderMgr.isFetchPersistentState())
  +//         {
  +//            if (first == null)
  +//            {
  +//               first = passivation_interceptor;
  +//            }
  +//            else
  +//            {
  +//               addInterceptor(first, passivation_interceptor);
  +//            }
  +//         }
  +//      }
  +//
  +//      if (cache_loader_interceptor != null)
  +//      {
  +//         if (!cacheLoaderMgr.isFetchPersistentState())
  +//         {
  +//            if (first == null)
  +//            {
  +//               first = cache_store_interceptor;
  +//            }
  +//            else
  +//            {
  +//               addInterceptor(first, cache_store_interceptor);
  +//            }
  +//         }
  +//      }
   
  -      if (cache_loader_interceptor != null)
  -      {
  -         if (!cacheLoaderMgr.isFetchPersistentState())
  +      if (repl_interceptor != null)
            {
               if (first == null)
               {
  -               first = cache_store_interceptor;
  +            first = repl_interceptor;
               }
               else
               {
  -               addInterceptor(first, cache_store_interceptor);
  -            }
  +            addInterceptor(first, repl_interceptor);
            }
         }
   
  -      if (repl_interceptor != null)
  -      {
            if (first == null)
            {
  -            first = repl_interceptor;
  +         first = lock_interceptor;
            }
            else
            {
  -            addInterceptor(first, repl_interceptor);
  -         }
  +         addInterceptor(first, lock_interceptor);
         }
   
  +
         if (unlock_interceptor != null)
         {
            if (first == null)
  @@ -240,7 +239,8 @@
   
         if (activation_interceptor != null)
         {
  -         if (!cacheLoaderMgr.isFetchPersistentState())
  +//         if (!cacheLoaderMgr.isFetchPersistentState())
  +         if (false)
            {
               if (first == null)
               {
  @@ -274,7 +274,8 @@
   
         if (cache_loader_interceptor != null)
         {
  -         if (!cacheLoaderMgr.isFetchPersistentState())
  +//         if (!cacheLoaderMgr.isFetchPersistentState())
  +         if (false)
            {
               if (first == null)
               {
  @@ -317,7 +318,7 @@
               addInterceptor(first, dataGravitatorInterceptor);
            }
         }
  -
  +//
   //      if (first == null)
   //      {
   //         first = lock_interceptor;