From jbosscache-commits at lists.jboss.org Tue Jul  1 09:39:03 2008
Content-Type: multipart/mixed; boundary="===============0948461133297206316=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r6140 - in core/trunk/src:
 main/java/org/jboss/cache/invocation and 1 other directories.
Date: Tue, 01 Jul 2008 09:39:03 -0400
Message-ID: <E1KDg4V-0007rV-D8@committer01.frg.pub.inap.atl.jboss.com>

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

Author: manik.surtani(a)jboss.com
Date: 2008-07-01 09:39:03 -0400 (Tue, 01 Jul 2008)
New Revision: 6140

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationCont=
ext.java
   core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java
Log:
Fixed wiping of context

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationC=
ontextInterceptor.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/interceptors/InvocationContext=
Interceptor.java	2008-07-01 13:33:42 UTC (rev 6139)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-07-01 13:39:03 UTC (rev 6140)
@@ -206,8 +206,10 @@
          ctx.setCommand(null);
          ctx.setMethodCall(null);
 =

-
-         ctx.reset();
+         // TODO: Calling ctx.reset() here breaks stuff.  Check whether th=
is is just becuse UTs expect stuff in the ctx or whether this really breaks=
 functionality.
+//         ctx.reset();
+         // instead, for now, just wipe contents of the looked up node map
+         ctx.clearLookedUpNodes();
       }
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocat=
ionContext.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/LegacyInvocationCon=
text.java	2008-07-01 13:33:42 UTC (rev 6139)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/LegacyInvocationCon=
text.java	2008-07-01 13:39:03 UTC (rev 6140)
@@ -33,7 +33,7 @@
 =

    public void clearLookedUpNodes()
    {
-      throw new UnsupportedOperationException("Should not be called on leg=
acy locking schemes!");
+      // no-op
    }
 =

    public Map<Fqn, NodeSPI> getLookedUpNodes()

Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTe=
st.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/test/java/org/jboss/cache/options/ForceWriteLockTest.jav=
a	2008-07-01 13:33:42 UTC (rev 6139)
+++ core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.jav=
a	2008-07-01 13:39:03 UTC (rev 6140)
@@ -6,8 +6,10 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Configuration.NodeLockingScheme;
 import org.jboss.cache.lock.LockManager;
 import org.jboss.cache.lock.LockType;
+import org.jboss.cache.transaction.DummyTransactionManagerLookup;
 import org.jboss.cache.util.TestingUtil;
 import static org.testng.AssertJUnit.assertTrue;
 import org.testng.annotations.AfterMethod;
@@ -22,7 +24,7 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  * @since 2.0.0
  */
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional", "pessimistic"})
 public class ForceWriteLockTest
 {
    private CacheSPI<String, String> cache;
@@ -33,7 +35,8 @@
    public void setUp()
    {
       Configuration c =3D new Configuration();
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.cla=
ss.getName());
+      c.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC);
       CacheFactory<String, String> instance =3D new DefaultCacheFactory<St=
ring, String>();
       cache =3D (CacheSPI<String, String>) instance.createCache(c);
       tm =3D cache.getTransactionManager();


--===============0948461133297206316==--