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

[Ben Wang]

  User: bwang   
  Date: 06/07/30 22:44:42

  Modified:    src-50/org/jboss/cache/pojo/impl    AdvisedPojoHandler.java
                        PojoCacheDelegate.java PojoCacheImpl.java
  Log:
  JBCACHE-686 Colelction handles undo properly.
  
  Revision  Changes    Path
  1.9       +3 -7      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- AdvisedPojoHandler.java	27 Jul 2006 14:25:26 -0000	1.8
  +++ AdvisedPojoHandler.java	31 Jul 2006 02:44:42 -0000	1.9
  @@ -16,13 +16,9 @@
   import org.jboss.cache.pojo.observable.Observer;
   import org.jboss.cache.pojo.memory.FieldPersistentReference;
   import org.jboss.cache.pojo.util.AopUtil;
  -import org.jboss.cache.pojo.interceptors.dynamic.AbstractCollectionInterceptor;
   import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
  -import org.jboss.cache.pojo.collection.CollectionInterceptorUtil;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.CacheException;
  -import org.jboss.aop.proxy.ClassProxy;
  -import org.jboss.aop.advice.Interceptor;
   import org.jboss.aop.InstanceAdvisor;
   import org.jboss.aop.Advised;
   import org.jboss.aop.ClassInstanceAdvisor;
  @@ -40,7 +36,7 @@
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: AdvisedPojoHandler.java,v 1.8 2006/07/27 14:25:26 bwang Exp $
  + * @version $Id: AdvisedPojoHandler.java,v 1.9 2006/07/31 02:44:42 bwang Exp $
    */
   class AdvisedPojoHandler
   {
  @@ -167,7 +163,7 @@
            if (value instanceof Map || value instanceof List || value instanceof Set)
            {
               Object newValue = pCache_.getObject(tmpFqn);
  -            util_.collectionReplaceWithProxy(obj, field, newValue);
  +            util_.fieldReplaceNewValue(obj, field, newValue);
            }
         }
   
  @@ -196,7 +192,7 @@
               if ((value instanceof Map || value instanceof List || value instanceof Set))
               {
                  // If this Collection class, we are returning the original value already
  -               util_.collectionReplaceWithProxy(result, field, value);
  +               util_.fieldReplaceNewValue(result, field, value);
               }
   
            }
  
  
  
  1.12      +1 -1      JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheDelegate.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- PojoCacheDelegate.java	28 Jul 2006 09:46:07 -0000	1.11
  +++ PojoCacheDelegate.java	31 Jul 2006 02:44:42 -0000	1.12
  @@ -378,7 +378,7 @@
      private boolean bulkRemove(Fqn fqn, Object obj) throws CacheException
      {
         // Check for cross-reference. If there is, we can't do bulk remove
  -      // map contains (pojo, cacheinterceptor) pair that needs to undo the the removal.
  +      // map contains (pojo, cacheinterceptor) pair that needs to rollback the the removal.
         Map undoMap = new HashMap();
         if (pojoGraphMultipleReferenced(obj, undoMap))
         {
  
  
  
  1.16      +1 -1      JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- PojoCacheImpl.java	28 Jul 2006 09:46:07 -0000	1.15
  +++ PojoCacheImpl.java	31 Jul 2006 02:44:42 -0000	1.16
  @@ -40,7 +40,7 @@
    * Implementation class for PojoCache interface
    *
    * @author Ben Wang
  - * @version $Id: PojoCacheImpl.java,v 1.15 2006/07/28 09:46:07 bwang Exp $
  + * @version $Id: PojoCacheImpl.java,v 1.16 2006/07/31 02:44:42 bwang Exp $
    */
   public class PojoCacheImpl implements PojoCache, Observer
   {