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

[Jason Thomas Greene]

  User: jgreene 
  Date: 07/06/12 20:08:59

  Modified:    src/org/jboss/cache/pojo/collection 
                        CollectionInterceptorUtil.java
  Log:
  Downgrade to AOP 1.5.5
  Remove Reentrancy checking (no longer needed)
  
  Revision  Changes    Path
  1.3       +8 -12     JBossCache/src/org/jboss/cache/pojo/collection/CollectionInterceptorUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CollectionInterceptorUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/collection/CollectionInterceptorUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CollectionInterceptorUtil.java	25 Jan 2007 21:54:05 -0000	1.2
  +++ CollectionInterceptorUtil.java	13 Jun 2007 00:08:59 -0000	1.3
  @@ -6,6 +6,13 @@
    */
   package org.jboss.cache.pojo.collection;
   
  +import java.lang.reflect.InvocationTargetException;
  +import java.lang.reflect.Method;
  +import java.util.HashMap;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Set;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.aop.AspectManager;
  @@ -24,16 +31,8 @@
   import org.jboss.cache.pojo.interceptors.dynamic.CachedListInterceptor;
   import org.jboss.cache.pojo.interceptors.dynamic.CachedMapInterceptor;
   import org.jboss.cache.pojo.interceptors.dynamic.CachedSetInterceptor;
  -import org.jboss.cache.pojo.interceptors.dynamic.ReentrancyStopperInterceptor;
   import org.jboss.cache.pojo.util.AopUtil;
   
  -import java.lang.reflect.InvocationTargetException;
  -import java.lang.reflect.Method;
  -import java.util.HashMap;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Set;
  -
   /**
    * CollectionInterceptorUtil contains helper methods for the interceptors of
    * the different collection types.
  @@ -75,11 +74,8 @@
                          + interceptor);
               }
   
  -            AdviceBinding bindingm = new AdviceBinding(bindName,
  -                    bind, null);
  -            bindingm.addInterceptor(ReentrancyStopperInterceptor.class);
  +            AdviceBinding bindingm = new AdviceBinding(bindName, bind, null);
               AspectManager.instance().addBinding(bindingm);
  -            //         result._getInstanceAdvisor().addBinding(bindingm);
            }
         }
         catch (ParseException e)