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

[Ben Wang]

  User: bwang   
  Date: 06/07/26 13:02:13

  Modified:    src-50/org/jboss/cache/pojo/impl  
                        CollectionClassHandler.java AdvisedPojoHandler.java
  Log:
  JBCACHE-714 Collection swapping of reference
  
  Revision  Changes    Path
  1.7       +2 -2      JBossCache/src-50/org/jboss/cache/pojo/impl/CollectionClassHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CollectionClassHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/CollectionClassHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- CollectionClassHandler.java	17 Jul 2006 09:07:08 -0000	1.6
  +++ CollectionClassHandler.java	26 Jul 2006 17:02:13 -0000	1.7
  @@ -30,7 +30,7 @@
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: CollectionClassHandler.java,v 1.6 2006/07/17 09:07:08 bwang Exp $
  + * @version $Id: CollectionClassHandler.java,v 1.7 2006/07/26 17:02:13 bwang Exp $
    */
   class CollectionClassHandler
   {
  @@ -202,6 +202,6 @@
         boolean removeFromCache = true;
         // detach the interceptor. This will trigger a copy and remove.
         ((AbstractCollectionInterceptor) interceptor).detach(removeFromCache);
  -      return ((AbstractCollectionInterceptor) interceptor).getCurrecntCopy();
  +      return ((AbstractCollectionInterceptor) interceptor).getCurrentCopy();
      }
   }
  
  
  
  1.7       +4 -6      JBossCache/src-50/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AdvisedPojoHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- AdvisedPojoHandler.java	17 Jul 2006 09:58:07 -0000	1.6
  +++ AdvisedPojoHandler.java	26 Jul 2006 17:02:13 -0000	1.7
  @@ -40,7 +40,7 @@
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: AdvisedPojoHandler.java,v 1.6 2006/07/17 09:58:07 bwang Exp $
  + * @version $Id: AdvisedPojoHandler.java,v 1.7 2006/07/26 17:02:13 bwang Exp $
    */
   class AdvisedPojoHandler
   {
  @@ -193,12 +193,10 @@
               value = pCache_.removeObject(new Fqn(fqn, field.getName()));
   
               // Check for Collection. If it is, we need to reset the original reference.
  -            if ((value instanceof Map || value instanceof List || value instanceof Set) &&
  -                 (value instanceof ClassProxy))
  +            if ((value instanceof Map || value instanceof List || value instanceof Set))
               {
  -               Interceptor interceptor = CollectionInterceptorUtil.getInterceptor((ClassProxy) value);
  -               Object origValue = ((AbstractCollectionInterceptor)interceptor).getCurrecntCopy();
  -               util_.collectionReplaceWithProxy(value, field, origValue);
  +               // If this Collection class, we are returning the original value already
  +               util_.collectionReplaceWithProxy(result, field, value);
               }
   
            }