From jbosscache-commits at lists.jboss.org Fri Dec 28 09:50:52 2007
Content-Type: multipart/mixed; boundary="===============8258834271945816877=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4924 - in
 core/trunk/src/main/java/org/jboss/cache: factories and 1 other directories.
Date: Fri, 28 Dec 2007 09:50:52 -0500
Message-ID: <E1J8GY0-0000c5-5r@committer01.frg.pub.inap.atl.jboss.com>

--===============8258834271945816877==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2007-12-28 09:50:51 -0500 (Fri, 28 Dec 2007)
New Revision: 4924

Added:
   core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextCon=
tainer.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFacto=
ry.java
   core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDe=
legate.java
Log:
InvocationContextContainer to be shared between all invocation delegates

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2007-12-28 13:3=
8:10 UTC (rev 4923)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2007-12-28 14:5=
0:51 UTC (rev 4924)
@@ -2173,7 +2173,8 @@
                append(fqn).append("\", k=3D").append(key).append(", v=3D")=
.append(value).append(")"));
       }
 =

-
+      // doesn't matter where we get this from - whether from the spi or t=
he remote delegate - since they both refer to a single
+      // invocation context container instance.
       InvocationContext ctx =3D spi.getInvocationContext();
       // if this is a rollback then don't fire notifications.
       boolean isRollback =3D checkIsRollingBack(ctx.getTransaction());

Modified: core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstruct=
orFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFact=
ory.java	2007-12-28 13:38:10 UTC (rev 4923)
+++ core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFact=
ory.java	2007-12-28 14:50:51 UTC (rev 4924)
@@ -3,6 +3,7 @@
 import org.jboss.cache.RegionManager;
 import org.jboss.cache.config.ConfigurationException;
 import org.jboss.cache.factories.annotations.DefaultFactoryFor;
+import org.jboss.cache.invocation.InvocationContextContainer;
 import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
 import org.jboss.cache.loader.CacheLoaderManager;
 import org.jboss.cache.marshall.Marshaller;
@@ -18,7 +19,7 @@
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  * @since 2.1.0
  */
-(a)DefaultFactoryFor(classes =3D {StateTransferManager.class, TransactionT=
able.class, RegionManager.class, Notifier.class, CacheMessageListener.class=
, CacheLoaderManager.class, RemoteCacheInvocationDelegate.class, Marshaller=
.class})
+(a)DefaultFactoryFor(classes =3D {StateTransferManager.class, TransactionT=
able.class, RegionManager.class, Notifier.class, CacheMessageListener.class=
, CacheLoaderManager.class, RemoteCacheInvocationDelegate.class, Marshaller=
.class, InvocationContextContainer.class})
 public class EmptyConstructorFactory extends ComponentFactory
 {
    @Override

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvoc=
ationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2007-12-28 13:38:10 UTC (rev 4923)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2007-12-28 14:50:51 UTC (rev 4924)
@@ -33,15 +33,7 @@
    protected Configuration configuration;
    protected boolean originLocal =3D true;
 =

-   protected ThreadLocal<InvocationContext> invocationContextContainer =3D=
 new ThreadLocal<InvocationContext>()
-   {
-      @Override
-      protected InvocationContext initialValue()
-      {
-         // create if this is initially unset
-         return new InvocationContext();
-      }
-   };
+   protected InvocationContextContainer invocationContextContainer;
 =

    /**
     * Used by the interceptor chain factory to inject dependencies.
@@ -51,11 +43,12 @@
     * @param configuration    configuration for the cache
     */
    @Inject
-   private void initialise(Interceptor interceptorChain, CacheImpl cache, =
Configuration configuration)
+   private void initialise(Interceptor interceptorChain, CacheImpl cache, =
Configuration configuration, InvocationContextContainer invocationContextCo=
ntainer)
    {
       this.interceptorChain =3D interceptorChain;
       this.cache =3D cache;
       this.configuration =3D configuration;
+      this.invocationContextContainer =3D invocationContextContainer;
    }
 =

    /**

Added: core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContex=
tContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextCo=
ntainer.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/InvocationContextCo=
ntainer.java	2007-12-28 14:50:51 UTC (rev 4924)
@@ -0,0 +1,19 @@
+package org.jboss.cache.invocation;
+
+import org.jboss.cache.InvocationContext;
+
+/**
+ * Container and factory for thread locals
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+public class InvocationContextContainer extends ThreadLocal<InvocationCont=
ext>
+{
+   @Override
+   protected InvocationContext initialValue()
+   {
+      // create if this is initially unset
+      return new InvocationContext();
+   }
+}


--===============8258834271945816877==--