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

[Manik Surtani]

  User: msurtani
  Date: 07/01/19 08:28:22

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  JBCACHE-943
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.42 +3 -7      JBossCache/src/org/jboss/cache/Attic/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/Attic/TreeCache.java,v
  retrieving revision 1.195.2.41
  retrieving revision 1.195.2.42
  diff -u -b -r1.195.2.41 -r1.195.2.42
  --- TreeCache.java	9 Jan 2007 01:24:16 -0000	1.195.2.41
  +++ TreeCache.java	19 Jan 2007 13:28:22 -0000	1.195.2.42
  @@ -15,7 +15,6 @@
   import org.jboss.cache.buddyreplication.BuddyNotInitException;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Option;
  -import org.jboss.cache.eviction.EvictedEventNode;
   import org.jboss.cache.eviction.EvictionPolicy;
   import org.jboss.cache.factories.InterceptorChainFactory;
   import org.jboss.cache.factories.NodeFactory;
  @@ -100,7 +99,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.195.2.41 2007/01/09 01:24:16 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.42 2007/01/19 13:28:22 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -3741,6 +3740,7 @@
       */
      public Object putFailFast(Fqn fqn, Object key, Object value, long timeout) throws CacheException
      {
  +      if (isNodeLockingOptimistic()) throw new UnsupportedOperationException("putFailFast() is not supported with Optimistic Locking");
         GlobalTransaction tx = getCurrentTransaction();
         MethodCall m = MethodCallFactory.create(MethodDeclarations.putFailFastKeyValueMethodLocal,
                 new Object[]{tx, fqn, key, value, Boolean.TRUE, new Long(timeout)});
  @@ -3758,11 +3758,7 @@
       */
      public Object putFailFast(String fqn, Object key, Object value, long timeout) throws CacheException
      {
  -      GlobalTransaction tx = getCurrentTransaction();
  -      Fqn fqntmp = Fqn.fromString(fqn);
  -      MethodCall m = MethodCallFactory.create(MethodDeclarations.putFailFastKeyValueMethodLocal,
  -              new Object[]{tx, fqntmp, key, value, Boolean.TRUE, new Long(timeout)});
  -      return invokeMethod(m);
  +      return putFailFast(Fqn.fromString(fqn), key, value, timeout);
      }
   
      /**