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

[Ben Wang]

  User: bwang   
  Date: 06/10/09 04:11:34

  Modified:    src-50/org/jboss/cache/pojo/impl   PojoCacheImpl.java
                        PojoCacheDelegate.java
  Log:
  Introduce __JBossInteral__ under a region, if set.
  
  Revision  Changes    Path
  1.23      +5 -5      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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- PojoCacheImpl.java	25 Sep 2006 05:50:05 -0000	1.22
  +++ PojoCacheImpl.java	9 Oct 2006 08:11:34 -0000	1.23
  @@ -45,7 +45,7 @@
    * Implementation class for PojoCache interface
    *
    * @author Ben Wang
  - * @version $Id: PojoCacheImpl.java,v 1.22 2006/09/25 05:50:05 bwang Exp $
  + * @version $Id: PojoCacheImpl.java,v 1.23 2006/10/09 08:11:34 bwang Exp $
    */
   public class PojoCacheImpl implements PojoCache, Observer
   {
  @@ -110,7 +110,7 @@
   
      public Object attach(String id, Object pojo) throws PojoCacheException
      {
  -      return attach(AopUtil.getIdWithRegion(id), pojo);
  +      return attach(Fqn.fromString(id), pojo);
      }
   
      @Attach
  @@ -147,7 +147,7 @@
   
      public Object detach(String id) throws PojoCacheException
      {
  -      return detach(AopUtil.getIdWithRegion(id));
  +      return detach(Fqn.fromString(id));
      }
   
      @Detach
  @@ -182,7 +182,7 @@
   
      public Object find(String id) throws PojoCacheException
      {
  -      return find(AopUtil.getIdWithRegion(id));
  +      return find(Fqn.fromString(id));
      }
   
      @Find
  @@ -206,7 +206,7 @@
   
      public Map findAll(String id) throws PojoCacheException
      {
  -      return findAll(AopUtil.getIdWithRegion(id));
  +      return findAll(Fqn.fromString(id));
      }
   
      @Find
  
  
  
  1.15      +2 -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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PojoCacheDelegate.java	7 Sep 2006 16:42:18 -0000	1.14
  +++ PojoCacheDelegate.java	9 Oct 2006 08:11:34 -0000	1.15
  @@ -17,6 +17,7 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.CacheSPI;
   import org.jboss.cache.Node;
  +import org.jboss.cache.Cache;
   import org.jboss.cache.pojo.interceptors.dynamic.AbstractCollectionInterceptor;
   import org.jboss.cache.pojo.memory.FieldPersistentReference;
   import org.jboss.cache.pojo.util.AopUtil;
  @@ -189,7 +190,7 @@
         pojoReference.setPojoClass(type.getType());
   
         // Create an internal Fqn name
  -      Fqn internalFqn = AopUtil.createInternalFqn();
  +      Fqn internalFqn = AopUtil.createInternalFqn(fqn, (Cache)cache_);
         // store PojoReference
         pojoReference.setFqn(internalFqn);
         internal_.putPojoReference(fqn, pojoReference);