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

[Manik Surtani]

  User: msurtani
  Date: 06/08/22 08:27:52

  Modified:    src/org/jboss/cache     CacheSPI.java InvocationContext.java
                        TreeCache.java TreeCacheProxyImpl.java
  Log:
  Problem with invocation context leaking into notifications
  
  Revision  Changes    Path
  1.10      +3 -2      JBossCache/src/org/jboss/cache/CacheSPI.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheSPI.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheSPI.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- CacheSPI.java	18 Aug 2006 15:40:40 -0000	1.9
  +++ CacheSPI.java	22 Aug 2006 12:27:51 -0000	1.10
  @@ -19,7 +19,6 @@
   
   import javax.management.ObjectName;
   import javax.transaction.TransactionManager;
  -import javax.transaction.Transaction;
   import java.util.List;
   import java.util.Map;
   
  @@ -71,7 +70,7 @@
       
       /**
        * 
  -     * @return the current {@link PojoStateTransferManager}
  +     * @return the current {@link org.jboss.cache.aop.statetransfer.PojoStateTransferManager}
        */
       StateTransferManager getStateTransferManager();
   
  @@ -144,4 +143,6 @@
        * Retrieves the current invocation context for the current invocation.
        */
       InvocationContext getInvocationContext();
  +
  +    void setInvocationContext(InvocationContext ctx);
   }
  
  
  
  1.8       +8 -1      JBossCache/src/org/jboss/cache/InvocationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvocationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/InvocationContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- InvocationContext.java	18 Aug 2006 15:40:40 -0000	1.7
  +++ InvocationContext.java	22 Aug 2006 12:27:51 -0000	1.8
  @@ -15,7 +15,7 @@
    *
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    */
  -public class InvocationContext
  +public class InvocationContext implements Cloneable
   {
       private Transaction transaction;
       private GlobalTransaction globalTransaction;
  @@ -150,4 +150,11 @@
           originLocal = true;
           txHasMods = false;
       }
  +
  +    public InvocationContext clone() throws CloneNotSupportedException
  +    {
  +        InvocationContext clone = (InvocationContext) super.clone();
  +        clone.setOptionOverrides(getOptionOverrides().clone());
  +        return clone;
  +    }
   }
  
  
  
  1.223     +6 -1      JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.222
  retrieving revision 1.223
  diff -u -b -r1.222 -r1.223
  --- TreeCache.java	21 Aug 2006 17:05:49 -0000	1.222
  +++ TreeCache.java	22 Aug 2006 12:27:51 -0000	1.223
  @@ -74,7 +74,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.222 2006/08/21 17:05:49 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.223 2006/08/22 12:27:51 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -3575,6 +3575,11 @@
           return ctx;
       }
   
  +    public void setInvocationContext(InvocationContext ctx)
  +    {
  +        invocationContextContainer.set(ctx);
  +    }
  +
       /*-------------------- MessageListener ----------------------*/
   
      class MessageListenerAdaptor implements MessageListener
  
  
  
  1.16      +6 -0      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- TreeCacheProxyImpl.java	22 Aug 2006 11:38:54 -0000	1.15
  +++ TreeCacheProxyImpl.java	22 Aug 2006 12:27:52 -0000	1.16
  @@ -15,6 +15,7 @@
   import org.jboss.cache.statetransfer.StateTransferManager;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.notifications.Notifier;
  +import org.jboss.invocation.*;
   import org.jgroups.Address;
   import org.jgroups.blocks.MethodCall;
   import org.apache.commons.logging.Log;
  @@ -520,6 +521,11 @@
           return treeCache.getInvocationContext();
       }
   
  +    public void setInvocationContext(InvocationContext ctx)
  +    {
  +        treeCache.setInvocationContext(ctx);
  +    }
  +
       public GlobalTransaction getCurrentTransaction(Transaction tx)
       {
           return treeCache.getCurrentTransaction(tx);