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

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 20:22:54

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Fixed dodgy persistent state tfr without transient state breakage
  
  Revision  Changes    Path
  1.41      +0 -43     JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- CacheImpl.java	30 Jan 2007 00:11:35 -0000	1.40
  +++ CacheImpl.java	30 Jan 2007 01:22:53 -0000	1.41
  @@ -1063,49 +1063,6 @@
   
      }
   
  -   /**
  -    * Returns the state for the portion of the cache named by <code>fqn</code>.
  -    * <p/>
  -    * State returned is a serialized byte[][], element 0 is the transient state
  -    * (or null), and element 1 is the persistent state (or null).
  -    *
  -    * @param fqn            Fqn indicating the uppermost node in the
  -    *                       portion of the cache whose state should be returned.
  -    * @param timeout        max number of ms this method should wait to acquire
  -    *                       a read lock on the nodes being transferred
  -    * @param force          if a read lock cannot be acquired after
  -    *                       <code>timeout</code> ms, should the lock acquisition
  -    *                       be forced, and any existing transactions holding locks
  -    *                       on the nodes be rolled back? <strong>NOTE:</strong>
  -    *                       In release 1.2.4, this parameter has no effect.
  -    * @param suppressErrors should any Throwable thrown be suppressed?
  -    * @return a serialized byte[][], element 0 is the transient state
  -    *         (or null), and element 1 is the persistent state (or null).
  -    *         <p/>
  -    *         <p/>
  -    *         TODO here only because of BuddyManager state transfer
  -    *         Consider for removal if BuddyManager transfer changes
  -    */
  -   public byte[] generateState(Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
  -   {
  -
  -      MarshalledValueOutputStream out = null;
  -      byte[] result = null;
  -      try
  -      {
  -         ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
  -         out = new MarshalledValueOutputStream(baos);
  -         getStateTransferManager().getState(out, fqn, timeout, force, suppressErrors);
  -         result = baos.getRawBuffer();
  -      }
  -      finally
  -      {
  -         Util.close(out);
  -      }
  -
  -      return result;
  -   }
  -
      private void removeLocksForDeadMembers(NodeSPI node,
                                             List deadMembers)
      {