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

[Ben Wang]

  User: bwang   
  Date: 06/11/16 01:44:02

  Modified:    src/org/jboss/cache/aop/collection     Tag:
                        Branch_JBossCache_1_4_0 CachedMapInterceptor.java
                        CachedListInterceptor.java
                        AbstractCollectionInterceptor.java
                        CachedSetInterceptor.java
  Log:
  JBCACHE-847 removeObject didn't restor Collection class instance.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +6 -1      JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedMapInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedMapInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedMapInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -b -r1.11 -r1.11.2.1
  --- CachedMapInterceptor.java	26 Apr 2006 02:16:59 -0000	1.11
  +++ CachedMapInterceptor.java	16 Nov 2006 06:44:02 -0000	1.11.2.1
  @@ -64,7 +64,7 @@
         }
   
         inMemImpl_.clear();
  -      inMemImpl_ = null;   // we are done with this.
  +//      inMemImpl_ = null;   // we are done with this.
      }
   
      /**
  @@ -120,4 +120,9 @@
               managedMethods_);
      }
   
  +   public Object getOriginalInstance()
  +   {
  +      return inMemImpl_;
  +   }
  +
   }
  
  
  
  1.11.2.1  +6 -1      JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedListInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedListInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedListInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -b -r1.11 -r1.11.2.1
  --- CachedListInterceptor.java	26 Apr 2006 02:16:59 -0000	1.11
  +++ CachedListInterceptor.java	16 Nov 2006 06:44:02 -0000	1.11.2.1
  @@ -73,7 +73,7 @@
            cacheImpl_.add(tmpList.get(size-i-1));
         }
   
  -      inMemImpl_ = null;   // we are done with this.
  +//      inMemImpl_ = null;   // we are done with this.
      }
   
      /**
  @@ -134,4 +134,9 @@
               methodMap_,
               managedMethods_);
      }
  +
  +   public Object getOriginalInstance()
  +   {
  +      return inMemImpl_;
  +   }
   }
  
  
  
  1.9.2.1   +6 -1      JBossCache/src/org/jboss/cache/aop/collection/Attic/AbstractCollectionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractCollectionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/AbstractCollectionInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -b -r1.9 -r1.9.2.1
  --- AbstractCollectionInterceptor.java	4 May 2006 16:28:12 -0000	1.9
  +++ AbstractCollectionInterceptor.java	16 Nov 2006 06:44:02 -0000	1.9.2.1
  @@ -15,7 +15,7 @@
    * Abstract base class for collection interceptor.
    *
    * @author Ben Wang
  - * @version $Id: AbstractCollectionInterceptor.java,v 1.9 2006/05/04 16:28:12 bwang Exp $
  + * @version $Id: AbstractCollectionInterceptor.java,v 1.9.2.1 2006/11/16 06:44:02 bwang Exp $
    */
   public abstract class AbstractCollectionInterceptor implements BaseInterceptor {
      protected Fqn fqn_;
  @@ -61,4 +61,9 @@
      {
         return attached_;
      }
  +
  +   public Object getOriginalInstance()
  +   {
  +      throw new RuntimeException("AbstractCollectionInterceptor.getOriginalInstance(). Abstract method");
  +   }
   }
  
  
  
  1.12.2.1  +6 -1      JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedSetInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedSetInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/collection/Attic/CachedSetInterceptor.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -b -r1.12 -r1.12.2.1
  --- CachedSetInterceptor.java	27 Apr 2006 15:40:16 -0000	1.12
  +++ CachedSetInterceptor.java	16 Nov 2006 06:44:02 -0000	1.12.2.1
  @@ -62,7 +62,7 @@
            cacheImpl_.add(obj);
         }
   
  -      inMemImpl_ = null;   // we are done with this.
  +//      inMemImpl_ = null;   // we are done with this.
      }
   
      /**
  @@ -112,4 +112,9 @@
               methodMap_,
               managedMethods_);
      }
  +
  +   public Object getOriginalInstance()
  +   {
  +      return inMemImpl_;
  +   }
   }