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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 13:26:06

  Modified:    src/org/jboss/cache/interceptors   TxInterceptor.java
                        PassivationInterceptor.java
  Log:
  Cleaned up cache factory
  
  Revision  Changes    Path
  1.70      +0 -2      JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TxInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -b -r1.69 -r1.70
  --- TxInterceptor.java	30 Dec 2006 17:49:54 -0000	1.69
  +++ TxInterceptor.java	2 Jan 2007 18:26:06 -0000	1.70
  @@ -360,7 +360,6 @@
       */
      private Object handleOptimisticPrepare(MethodCall m, GlobalTransaction gtx, List<MethodCall> modifications, boolean onePhase, Transaction ltx) throws Throwable
      {
  -      // TODO: Manik: Refactor this to pass across entire workspace?
         Object retval;
         if (log.isDebugEnabled()) log.debug("Handling optimistic remote prepare " + gtx);
         replayModifications(modifications, ltx, true);
  @@ -765,7 +764,6 @@
       */
      protected Object runPreparePhase(GlobalTransaction gtx, List modifications) throws Throwable
      {
  -      // TODO: Manik: one phase commit for opt locking too if using repl-async?
         // build the method call
         MethodCall prepareMethod;
         //        if (cache.getCacheModeInternal() != CacheImpl.REPL_ASYNC)
  
  
  
  1.37      +1 -4      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.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- PassivationInterceptor.java	2 Jan 2007 17:15:29 -0000	1.36
  +++ PassivationInterceptor.java	2 Jan 2007 18:26:06 -0000	1.37
  @@ -16,7 +16,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.36 2007/01/02 17:15:29 msurtani Exp $
  + * @version $Id: PassivationInterceptor.java,v 1.37 2007/01/02 18:26:06 msurtani Exp $
    */
   public class PassivationInterceptor extends Interceptor implements PassivationInterceptorMBean
   {
  @@ -60,7 +60,6 @@
   
                  loader.put(fqn, attributes);
   
  -               // TODO -- should this be moved to after super.invoke()??
                  cache.getNotifier().notifyNodePassivated(fqn, false);
               }
   
  @@ -75,8 +74,6 @@
               {
                  log.trace("Node " + fqn + " not loaded in memory; passivation skipped");
               }
  -            // TODO should we just return here and abort the rest of the 
  -            // interceptor chain? Probably a bad idea.
            }
         }