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

[Manik Surtani]

  User: msurtani
  Date: 07/01/19 05:50:42

  Modified:    src/org/jboss/cache/pojo/impl  AdvisedPojoHandler.java
  Log:
  API Changes
  
  Revision  Changes    Path
  1.2       +29 -27    JBossCache/src/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/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AdvisedPojoHandler.java	13 Jan 2007 15:55:06 -0000	1.1
  +++ AdvisedPojoHandler.java	19 Jan 2007 10:50:42 -0000	1.2
  @@ -9,35 +9,35 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.jboss.aop.Advised;
  +import org.jboss.aop.Advisor;
  +import org.jboss.aop.ClassInstanceAdvisor;
  +import org.jboss.aop.InstanceAdvisor;
  +import org.jboss.cache.CacheException;
  +import org.jboss.cache.CacheSPI;
  +import org.jboss.cache.Fqn;
   import org.jboss.cache.pojo.CachedType;
  +import org.jboss.cache.pojo.InternalConstant;
   import org.jboss.cache.pojo.PojoInstance;
   import org.jboss.cache.pojo.PojoUtil;
  -import org.jboss.cache.pojo.InternalConstant;
  -import org.jboss.cache.pojo.observable.Observer;
  +import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
   import org.jboss.cache.pojo.memory.FieldPersistentReference;
  +import org.jboss.cache.pojo.observable.Observer;
   import org.jboss.cache.pojo.util.AopUtil;
  -import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
  -import org.jboss.cache.Fqn;
  -import org.jboss.cache.CacheException;
  -import org.jboss.cache.CacheSPI;
  -import org.jboss.aop.InstanceAdvisor;
  -import org.jboss.aop.Advised;
  -import org.jboss.aop.ClassInstanceAdvisor;
  -import org.jboss.aop.Advisor;
   
  -import java.util.Map;
  +import java.lang.reflect.Field;
  +import java.util.HashMap;
  +import java.util.Iterator;
   import java.util.List;
  +import java.util.Map;
   import java.util.Set;
  -import java.util.Iterator;
  -import java.util.HashMap;
  -import java.lang.reflect.Field;
   
   /**
    * Handling the advised pojo operations. No consideration of object graph here.
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: AdvisedPojoHandler.java,v 1.1 2007/01/13 15:55:06 bwang Exp $
  + * @version $Id: AdvisedPojoHandler.java,v 1.2 2007/01/19 10:50:42 msurtani Exp $
    */
   class AdvisedPojoHandler
   {
  @@ -51,7 +51,7 @@
                                PojoUtil util, Observer observer)
      {
         pCache_ = pCache;
  -      cache_ = (CacheSPI)pCache_.getCache();
  +      cache_ = (CacheSPI) pCache_.getCache();
         util_ = util;
         observer_ = observer;
      }
  @@ -72,7 +72,7 @@
            try
            {
               obj = loadFromOthers(fqn, clazz);
  -            if(obj == null) throw e;
  +            if (obj == null) throw e;
            }
            catch (Exception e1)
            {
  @@ -90,14 +90,14 @@
      private Object loadFromOthers(Fqn fqn, Class clazz) throws Exception
      {
         // Try Enum first.
  -      if(clazz.isEnum())
  +      if (clazz.isEnum())
         {
  -         String name = (String)pCache_.getCache().get(fqn, InternalConstant.ENUM_KEY);
  -         if(name == null)
  +         String name = (String) pCache_.getCache().get(fqn, InternalConstant.ENUM_KEY);
  +         if (name == null)
            {
               throw new CacheException(
                       "AdvisedPojoHandler.loadFromOthers(): can't retrieve java.lang.Enum name field."
  -                     + " fqn: " +fqn);
  +                            + " fqn: " + fqn);
            }
            Object obj = Enum.valueOf(clazz, name);
            return obj;
  @@ -168,7 +168,8 @@
            {
               // switched using batch update
               map.put(field.getName(), value);
  -         } else
  +         }
  +         else
            {
               subPojoMap.put(field, value);
            }
  @@ -177,7 +178,7 @@
         // Use option to skip locking since we have parent lock already.
   //      cache_.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
   
  -      cache_.getRoot().addChild(fqn).put(map);
  +      cache_.getRoot().addChild(fqn).putAll(map);
   //      cache_.getInvocationContext().getOptionOverrides().setSuppressLocking(false);
         // This is in-memory operation only
         InternalHelper.setPojo(pojoInstance, obj);
  @@ -186,7 +187,7 @@
         {
            Field field = (Field) o;
            Object value = subPojoMap.get(field);
  -         if(value == null) continue; // really no need to map the POJO.
  +         if (value == null) continue; // really no need to map the POJO.
            Fqn tmpFqn = new Fqn(fqn, field.getName());
            pCache_.attach(tmpFqn, value);
            // If it is Collection classes, we replace it with dynamic proxy.
  @@ -236,8 +237,9 @@
         // Remember to remove the interceptor from in-memory object but make sure it belongs to me first.
         if (interceptor != null)
         {
  -         if (log.isDebugEnabled()) {
  -            log.debug("regularRemoveObject(): removed cache interceptor fqn: " + fqn + " interceptor: "+interceptor);
  +         if (log.isDebugEnabled())
  +         {
  +            log.debug("regularRemoveObject(): removed cache interceptor fqn: " + fqn + " interceptor: " + interceptor);
            }
            util_.detachInterceptor(advisor, interceptor, observer_);
         }