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

[Manik Surtani]

  User: msurtani
  Date: 06/09/07 11:42:16

  Modified:    src/org/jboss/cache   NodeImpl.java TreeCache.java
  Log:
  Updated options API usage
  
  Revision  Changes    Path
  1.12      +1 -1      JBossCache/src/org/jboss/cache/NodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/NodeImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- NodeImpl.java	6 Sep 2006 14:45:41 -0000	1.11
  +++ NodeImpl.java	7 Sep 2006 15:42:15 -0000	1.12
  @@ -260,7 +260,7 @@
         {
            if (data == null)
            {
  -            return Collections.emptyMap();
  +            return new HashMap(0);
            }
            return new HashMap(data);
         }
  
  
  
  1.241     +1 -150    JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.240
  retrieving revision 1.241
  diff -u -b -r1.240 -r1.241
  --- TreeCache.java	7 Sep 2006 13:52:28 -0000	1.240
  +++ TreeCache.java	7 Sep 2006 15:42:15 -0000	1.241
  @@ -13,7 +13,6 @@
   import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Configuration;
  -import org.jboss.cache.config.Option;
   import org.jboss.cache.factories.InterceptorChainFactory;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.interceptors.Interceptor;
  @@ -93,7 +92,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.240 2006/09/07 13:52:28 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.241 2006/09/07 15:42:15 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -1715,154 +1714,6 @@
      }
   
      /**
  -    * The same as calling {@link #get(Fqn)}  except that you can pass in options for this specific method invocation.
  -    * {@link Option}
  -    *
  -    * @param fqn
  -    * @param option
  -    * @return
  -    * @throws CacheException
  -    */
  -   public DataNode get(Fqn fqn, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -
  -      try
  -      {
  -         return get(fqn);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling get(Fqn, Object) except that you can pass in options for this specific method invocation.
  -    * {@link Option}
  -    *
  -    * @param fqn
  -    * @param option
  -    * @return
  -    * @throws CacheException
  -    */
  -   public Object get(Fqn fqn, Object key, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         return get(fqn, key);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling {@link #get(Fqn, Object, boolean)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public Object get(Fqn fqn, Object key, boolean sendNodeEvent, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         return get(fqn, key, sendNodeEvent);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling {@link #remove(Fqn)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public void remove(Fqn fqn, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         remove(fqn);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling {@link #remove(Fqn, Object)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public Object remove(Fqn fqn, Object key, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         return remove(fqn, key);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling {@link #getChildrenNames(Fqn)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public Set getChildrenNames(Fqn fqn, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         return getChildrenNames(fqn);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -
  -   }
  -
  -   /**
  -    * The same as calling {@link #put(Fqn, Map)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public void put(Fqn fqn, Map data, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         put(fqn, data);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
  -    * The same as calling {@link #put(Fqn, Object, Object)} except apply options for this
  -    * specific method invocation.
  -    */
  -   public void put(Fqn fqn, Object key, Object value, Option option) throws CacheException
  -   {
  -      getInvocationContext().setOptionOverrides(option);
  -      try
  -      {
  -         put(fqn, key, value);
  -      }
  -      finally
  -      {
  -         getInvocationContext().setOptionOverrides(null);
  -      }
  -   }
  -
  -   /**
       * Returns a DataNode corresponding to the fully qualified name or null if
       * does not exist.
       * No guarantees wrt replication, cache loading are given if the underlying node is modified