[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/interceptors ...
Ben Wang
bwang at jboss.com
Tue Sep 5 02:11:25 EDT 2006
User: bwang
Date: 06/09/05 02:11:25
Modified: src-50/org/jboss/cache/pojo/interceptors
AbstractInterceptor.java
PojoFailedTxMockupInterceptor.java
PojoTxInterceptor.java PojoTxLockInterceptor.java
Log:
First cuto of the using 2.0 Cache API
Revision Changes Path
1.3 +10 -3 JBossCache/src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractInterceptor.java 7 Jul 2006 09:34:41 -0000 1.2
+++ AbstractInterceptor.java 5 Sep 2006 06:11:25 -0000 1.3
@@ -12,19 +12,26 @@
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.cache.pojo.PojoTreeCache;
import org.jboss.cache.pojo.impl.PojoCacheImpl;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.InvocationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** Base interceptor class for PojoCache interceptor stack.
*
* @author Ben Wang
- * @version $Id: AbstractInterceptor.java,v 1.2 2006/07/07 09:34:41 bwang Exp $
+ * @version $Id: AbstractInterceptor.java,v 1.3 2006/09/05 06:11:25 bwang Exp $
*/
public abstract class AbstractInterceptor implements Interceptor
{
protected final Log log = LogFactory.getLog(AbstractInterceptor.this.getClass());
- protected PojoTreeCache getCache(MethodInvocation in)
+ protected InvocationContext getInvocationContext(MethodInvocation in)
+ {
+ return ((PojoCacheImpl)in.getTargetObject()).getUnderlyingCache().getInvocationContext();
+ }
+
+ protected CacheSPI getCache(MethodInvocation in)
{
return ((PojoCacheImpl)in.getTargetObject()).getUnderlyingCache();
}
1.2 +2 -2 JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoFailedTxMockupInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoFailedTxMockupInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoFailedTxMockupInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PojoFailedTxMockupInterceptor.java 31 Jul 2006 02:27:37 -0000 1.1
+++ PojoFailedTxMockupInterceptor.java 5 Sep 2006 06:11:25 -0000 1.2
@@ -19,7 +19,7 @@
* has been performed.
*
* @author Ben Wang
- * @version $Id: PojoFailedTxMockupInterceptor.java,v 1.1 2006/07/31 02:27:37 bwang Exp $
+ * @version $Id: PojoFailedTxMockupInterceptor.java,v 1.2 2006/09/05 06:11:25 bwang Exp $
*/
public class PojoFailedTxMockupInterceptor extends AbstractInterceptor
{
@@ -39,7 +39,7 @@
}
MethodInvocation invocation = (MethodInvocation) in;
- Transaction tx = getCache(invocation).getTransaction();
+ Transaction tx = getInvocationContext(invocation).getTransaction();
try
{
Object obj = null;
1.3 +2 -2 JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PojoTxInterceptor.java 27 Jul 2006 14:25:27 -0000 1.2
+++ PojoTxInterceptor.java 5 Sep 2006 06:11:25 -0000 1.3
@@ -22,7 +22,7 @@
* Interceptor (done via aop advice) for transaction
*
* @author Ben Wang
- * @version $Id: PojoTxInterceptor.java,v 1.2 2006/07/27 14:25:27 bwang Exp $
+ * @version $Id: PojoTxInterceptor.java,v 1.3 2006/09/05 06:11:25 bwang Exp $
*/
public class PojoTxInterceptor extends AbstractInterceptor
{
@@ -39,7 +39,7 @@
}
MethodInvocation invocation = (MethodInvocation) in;
- Transaction tx = getCache(invocation).getTransaction();
+ Transaction tx = getInvocationContext(invocation).getTransaction();
boolean needTx = false;
if (tx == null) needTx = true;
Fqn id = null;
1.5 +8 -5 JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTxLockInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PojoTxLockInterceptor.java 27 Jul 2006 14:25:27 -0000 1.4
+++ PojoTxLockInterceptor.java 5 Sep 2006 06:11:25 -0000 1.5
@@ -15,11 +15,12 @@
import org.jboss.cache.lock.UpgradeException;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheSPI;
/** Interceptor that handles the parent node lock associated with transaction.
*
* @author Ben Wang
- * @version $Id: PojoTxLockInterceptor.java,v 1.4 2006/07/27 14:25:27 bwang Exp $
+ * @version $Id: PojoTxLockInterceptor.java,v 1.5 2006/09/05 06:11:25 bwang Exp $
*/
public class PojoTxLockInterceptor extends AbstractInterceptor
{
@@ -41,15 +42,16 @@
private void handleLock(MethodInvocation invocation) throws Throwable
{
Fqn id = (Fqn)invocation.getArguments()[0];
- PojoTreeCache cache = getCache(invocation);
- Object owner = cache.getLockOwner();
+ CacheSPI cache = getCache(invocation);
+// Object owner = cache.getLockOwner();
+ Object owner = null;
if (!lockPojo(owner, id, cache))
{
throw new PojoCacheException("PojoCache.removeObject(): Can't obtain the pojo lock under id: " + id);
}
}
- private boolean lockPojo(Object owner, Fqn id, PojoTreeCache cache) throws CacheException
+ private boolean lockPojo(Object owner, Fqn id, CacheSPI cache) throws CacheException
{
if (log.isDebugEnabled())
{
@@ -81,7 +83,8 @@
{
log.warn("lockPojo(): can't upgrade the lock during lockPojo. Will re-try. id: " + realId
+ " retry times: " + retry);
- cache.get(realId).release(owner);
+// TODO is this really ok to comment out??
+// cache.get(realId).release(owner);
if (retry++ > RETRY)
{
return false;
More information about the jboss-cvs-commits
mailing list