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

[Manik Surtani]

  User: msurtani
  Date: 06/08/25 07:59:03

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  fixed 
  - eviction interceptor
  - removed putFailFast()
  - notifications with null data
  
  Revision  Changes    Path
  1.228     +3 -57     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.227
  retrieving revision 1.228
  diff -u -b -r1.227 -r1.228
  --- TreeCache.java	24 Aug 2006 22:05:34 -0000	1.227
  +++ TreeCache.java	25 Aug 2006 11:59:03 -0000	1.228
  @@ -76,7 +76,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.227 2006/08/24 22:05:34 vblagojevic Exp $
  + * @version $Id: TreeCache.java,v 1.228 2006/08/25 11:59:03 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2013,51 +2013,6 @@
         return put(Fqn.fromString(fqn), key, value);
      }
   
  -
  -   /**
  -    * Put with the following properties:
  -    * <ol>
  -    * <li>Fails fast (after timeout milliseconds)
  -    * <li>If replication is used: replicates <em>asynchronously</em>, overriding a potential synchronous mode
  -    * </ol>
  -    * This method should be used without running in a transaction (suspend()/resume() before calling it)
  -    *
  -    * @param fqn     The fully qualified name of the node
  -    * @param key
  -    * @param value
  -    * @param timeout Number of milliseconds to wait until a lock has been acquired. A TimeoutException will
  -    *                be thrown if not successful. 0 means to wait forever
  -    * @return
  -    * @throws CacheException
  -    * @deprecated This is a kludge created specifically form the Hibernate 3.0 release. This method should
  -    *             <em>not</em> be used by any application. The methodV will likely be removed in a future release
  -    */
  -   public Object putFailFast(Fqn fqn, Object key, Object value, long timeout) throws CacheException
  -   {
  -      GlobalTransaction tx = getCurrentTransaction();
  -      MethodCall m = MethodCallFactory.create(MethodDeclarations.putFailFastKeyValueMethodLocal,
  -         new Object[]{tx, fqn, key, value, Boolean.TRUE, new Long(timeout)});
  -      return invokeMethod(m);
  -   }
  -
  -   /**
  -    * @param fqn
  -    * @param key
  -    * @param value
  -    * @param timeout
  -    * @return
  -    * @throws CacheException
  -    * @deprecated
  -    */
  -   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);
  -   }
  -
      /**
       * Adds a key and value to a given node. If the node doesn't exist, it will be created. If the node
       * already existed, a nodeModified() notification will be generated. Otherwise a
  @@ -2825,15 +2780,6 @@
      }
   
      /**
  -    * Internal put method.
  -    */
  -   public Object _put(GlobalTransaction tx, Fqn fqn, Object key, Object value, boolean create_undo_ops, long timeout)
  -      throws CacheException
  -   {
  -      return _put(tx, fqn, key, value, create_undo_ops);
  -   }
  -
  -   /**
       * Internal remove method.
       */
      public void _remove(GlobalTransaction tx, String fqn, boolean create_undo_ops) throws CacheException
  @@ -2929,7 +2875,7 @@
         if (eviction)
           notifier.notifyNodeEvicted(fqn, true);
          else
  -        notifier.notifyNodeRemoved(fqn, true, Collections.unmodifiableMap(n.getData()));
  +        notifier.notifyNodeRemoved(fqn, true, n.getData() == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
   
         parent_node = n.getParent();