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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 12:15:30

  Modified:    src-50/org/jboss/cache/pojo/impl  InternalHelper.java
  Log:
  some api changes
  
  Revision  Changes    Path
  1.7       +15 -10    JBossCache/src-50/org/jboss/cache/pojo/impl/InternalHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InternalHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/InternalHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- InternalHelper.java	5 Sep 2006 06:11:25 -0000	1.6
  +++ InternalHelper.java	2 Jan 2007 17:15:30 -0000	1.7
  @@ -9,13 +9,13 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.CacheException;
  -import org.jboss.cache.Fqn;
   import org.jboss.cache.CacheSPI;
  +import org.jboss.cache.Fqn;
   import org.jboss.cache.config.Option;
  -import org.jboss.cache.pojo.util.ObjectUtil;
  -import org.jboss.cache.pojo.PojoInstance;
   import org.jboss.cache.pojo.InternalConstant;
  +import org.jboss.cache.pojo.PojoInstance;
   import org.jboss.cache.pojo.PojoReference;
  +import org.jboss.cache.pojo.util.ObjectUtil;
   
   import java.util.Map;
   
  @@ -46,7 +46,8 @@
         if (cacheOperationSkipLocking_)
         {
            skipLockOption_.setSuppressLocking(true);
  -      } else
  +      }
  +      else
         {
            skipLockOption_.setSuppressLocking(false);
         }
  @@ -132,14 +133,16 @@
            Object obj = cache_.get(fqn, key);
            cache_.getInvocationContext().getOptionOverrides().setForceDataGravitation(false);
            return obj;
  -      } else if (cache_.getCacheLoader() != null)
  +      }
  +      else if (cache_.getCacheLoaderManager() != null)
         {
            // We have cache loader, we can't get it directly from the local get.
            cache_.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
            Object obj = cache_.get(fqn, key);
            cache_.getInvocationContext().getOptionOverrides().setSuppressLocking(false);
            return obj;
  -      } else
  +      }
  +      else
         {
   //         return cache_._get(fqn, key, false);
            return cache_.get(fqn, key);
  @@ -246,11 +249,12 @@
      {
         PojoReference pojoReference = getPojoReference(fqn);
         Fqn realFqn = null;
  -      if(pojoReference != null)
  +      if (pojoReference != null)
         {
            // This is outward facing node
            realFqn = pojoReference.getFqn();
  -      } else
  +      }
  +      else
         {
            // This is the internal node.
            realFqn = fqn;
  @@ -292,7 +296,7 @@
   
      static boolean isMultipleReferenced(PojoInstance pojoInstance)
      {
  -      if(pojoInstance.getRefCount() > (PojoInstance.INITIAL_COUNTER_VALUE+1)) return true;
  +      if (pojoInstance.getRefCount() > (PojoInstance.INITIAL_COUNTER_VALUE + 1)) return true;
   
         return false;
      }
  @@ -352,7 +356,8 @@
         {
            // remove everything
            cache_.removeNode(fqn);
  -      } else
  +      }
  +      else
         {
            // Assume everything here is all PojoCache data for optimization
            cache_.getRoot().getChild(fqn).clearData();