[jboss-cvs] JBossCache/src/org/jboss/cache/aop ...

[Ben Wang]

  User: bwang   
  Date: 06/09/17 04:25:35

  Modified:    src/org/jboss/cache/aop  Tag: Branch_JBossCache_1_4_0
                        CollectionClassHandler.java
  Log:
  JBCACHE-760 notification
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.22.2.1  +10 -5     JBossCache/src/org/jboss/cache/aop/CollectionClassHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CollectionClassHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/CollectionClassHandler.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -b -r1.22 -r1.22.2.1
  --- CollectionClassHandler.java	29 May 2006 09:58:48 -0000	1.22
  +++ CollectionClassHandler.java	17 Sep 2006 08:25:35 -0000	1.22.2.1
  @@ -25,7 +25,7 @@
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: CollectionClassHandler.java,v 1.22 2006/05/29 09:58:48 bwang Exp $
  + * @version $Id: CollectionClassHandler.java,v 1.22.2.1 2006/09/17 08:25:35 bwang Exp $
    */
   public class CollectionClassHandler {
      protected final static Log log=LogFactory.getLog(CollectionClassHandler.class);
  @@ -107,6 +107,15 @@
            }
         }
   
  +      //JBCACHE-760: for collection - put initialized aopInstance in fqn
  +      if (!(obj instanceof Map || obj instanceof List || obj instanceof Set)) {
  +          return false;
  +      }
  +
  +      // Always initialize the ref count so that we can mark this as an AopNode.
  +      AOPInstance aopInstance = internal_.initializeAopInstance(fqn);
  +      cache_.put(fqn, AOPInstance.KEY, aopInstance);
  +
         if (obj instanceof Map) {
            if (log.isDebugEnabled()) {
               log.debug("collectionPutObject(): aspectized obj is a Map type of size: " + ((Map) obj).size());
  @@ -186,10 +195,6 @@
   
         if(isCollection)
         {
  -         // Always initialize the ref count so that we can mark this as an AopNode.
  -         AOPInstance aopInstance = internal_.initializeAopInstance(fqn);
  -         cache_.put(fqn, AOPInstance.KEY, aopInstance);
  -
            // Attach aopInstance to that interceptor
            BaseInterceptor baseInterceptor = (BaseInterceptor)CollectionInterceptorUtil.getInterceptor((ClassProxy)obj);
            baseInterceptor.setAopInstance(aopInstance);