[jboss-cvs] JBossCache/src/org/jboss/cache/pojo/impl ...
Jason Thomas Greene
jgreene at jboss.com
Tue Jun 12 20:08:59 EDT 2007
User: jgreene
Date: 07/06/12 20:08:59
Modified: src/org/jboss/cache/pojo/impl CacheListenerAdaptor.java
PojoUtil.java
Log:
Downgrade to AOP 1.5.5
Remove Reentrancy checking (no longer needed)
Revision Changes Path
1.5 +12 -11 JBossCache/src/org/jboss/cache/pojo/impl/CacheListenerAdaptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheListenerAdaptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/impl/CacheListenerAdaptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CacheListenerAdaptor.java 11 Jun 2007 15:06:03 -0000 1.4
+++ CacheListenerAdaptor.java 13 Jun 2007 00:08:59 -0000 1.5
@@ -22,14 +22,23 @@
package org.jboss.cache.pojo.impl;
+import static org.jboss.cache.pojo.impl.InternalConstant.POJOCACHE_OPERATION;
+import static org.jboss.cache.pojo.impl.InternalConstant.POJOCACHE_STATUS;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.AbstractCacheListener;
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheListener;
-import static org.jboss.cache.pojo.impl.InternalConstant.POJOCACHE_OPERATION;
-import static org.jboss.cache.pojo.impl.InternalConstant.POJOCACHE_STATUS;
import org.jboss.cache.pojo.interceptors.PojoTxLockInterceptor;
import org.jboss.cache.pojo.notification.AttachNotification;
import org.jboss.cache.pojo.notification.DetachNotification;
@@ -40,15 +49,7 @@
import org.jboss.cache.pojo.notification.NotificationContext;
import org.jboss.cache.pojo.notification.SetModifyNotification;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-// $Id: CacheListenerAdaptor.java,v 1.4 2007/06/11 15:06:03 msurtani Exp $
+// $Id: CacheListenerAdaptor.java,v 1.5 2007/06/13 00:08:59 jgreene Exp $
/**
* Adapts the core cache listener API into the POJO listener API.
1.2 +4 -50 JBossCache/src/org/jboss/cache/pojo/impl/PojoUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoUtil.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/impl/PojoUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PojoUtil.java 30 May 2007 06:08:02 -0000 1.1
+++ PojoUtil.java 13 Jun 2007 00:08:59 -0000 1.2
@@ -7,31 +7,27 @@
package org.jboss.cache.pojo.impl;
+import java.lang.reflect.Field;
+import java.util.List;
+
import org.jboss.aop.Advised;
import org.jboss.aop.Domain;
import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.advice.AdviceBinding;
import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.pointcut.ast.ParseException;
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.PojoCacheException;
import org.jboss.cache.pojo.annotation.TxUndo;
import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
-import org.jboss.cache.pojo.interceptors.dynamic.ReentrancyStopperInterceptor;
-
-import java.lang.reflect.Field;
-import java.util.List;
/**
* Utility class for method wrappers that we are interested to rollback (i.e., rollback).
*
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.1 2007/05/30 06:08:02 jgreene Exp $
+ * @version $Id: PojoUtil.java,v 1.2 2007/06/13 00:08:59 jgreene Exp $
*/
public class PojoUtil
{
private static final String BindingName = "ReentrancyStopperInterceptor.";
- private boolean checkRecursive = false;
@TxUndo
public void attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor)
@@ -74,36 +70,7 @@
private void _attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor)
{
- // Note that subject interceptor should come before the cache interceptor.
advisor.appendInterceptor(interceptor);
-
- if (checkRecursive)
- {
- // Insert interceptor to detect recursive call
- Class clazz = pojo.getClass();
- Field[] fields = clazz.getDeclaredFields();
- String clazzName = clazz.getName();
- for (Field field : fields)
- {
- String name = field.getName();
- if (name.contains("$aop")) continue; // this is aop declared field.
- StringBuffer buf = new StringBuffer().append("set(* ").append(clazzName).append("->").
- append(name).append(")");
-
- AdviceBinding binding = null;
- try
- {
- binding = new AdviceBinding(BindingName + name, buf.toString(), null);
- }
- catch (ParseException e)
- {
- throw new PojoCacheException("PojoUtil._attachInterceptor(): can't parse the field binding: "
- + e, e);
- }
- binding.addInterceptor(ReentrancyStopperInterceptor.class);
- getInstanceDomain(pojo).addBinding(binding);
- }
- }
}
private Domain getInstanceDomain(Object obj)
@@ -137,19 +104,6 @@
{
throw new PojoCacheException("PojoUtil.detachInterceptor(): null pojo");
}
-
- if (checkRecursive)
- {
- // Insert interceptor to detect recursive call
- Class clazz = pojo.getClass();
- Field[] fields = clazz.getDeclaredFields();
- for (Field field : fields)
- {
- String name = field.getName();
- if (name.contains("$aop")) continue; // this is aop declared field.
- getInstanceDomain(pojo).removeBinding(BindingName + name);
- }
- }
}
@TxUndo
More information about the jboss-cvs-commits
mailing list