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

Manik Surtani msurtani at jboss.com
Tue Oct 24 07:35:31 EDT 2006


  User: msurtani
  Date: 06/10/24 07:35:31

  Modified:    src/org/jboss/cache/statetransfer  StateTransferManager.java
  Log:
  JBCACHE-137: Consolidation of JBoss core libraries and updating dependencies
  
  Revision  Changes    Path
  1.12      +4 -7      JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- StateTransferManager.java	11 Sep 2006 21:53:19 -0000	1.11
  +++ StateTransferManager.java	24 Oct 2006 11:35:31 -0000	1.12
  @@ -21,8 +21,8 @@
   import org.jboss.cache.marshall.MethodDeclarations;
   import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.util.ExposedByteArrayOutputStream;
  -import org.jboss.invocation.MarshalledValueInputStream;
  -import org.jboss.invocation.MarshalledValueOutputStream;
  +import org.jboss.util.stream.MarshalledValueOutputStream;
  +import org.jboss.util.stream.MarshalledValueInputStream;
   
   import java.io.ByteArrayInputStream;
   import java.io.InputStream;
  @@ -83,9 +83,6 @@
       * @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).
  -    * @throws UnsupportedOperationException if persistent state transfer is
  -    *                                       enabled, the requested Fqn is not the root node, and the
  -    *                                       cache loader does not implement {@link ExtendedCacheLoader}.
       */
      public byte[] getState(OutputStream os, Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
      {
  @@ -291,7 +288,7 @@
       * is up to the caller to lock <code>targetRoot</code> before calling
       * this method.
       *
  -    * @param new_state  a serialized byte[][] array where element 0 is the
  +    * @param state  a serialized byte[][] array where element 0 is the
       *                   transient state (or null) , and element 1 is the
       *                   persistent state (or null)
       * @param targetRoot fqn of the node into which the state should be integrated
  @@ -323,7 +320,7 @@
       * is up to the caller to lock <code>targetRoot</code> before calling
       * this method.
       *
  -    * @param new_state  a serialized byte[][] array where element 0 is the
  +    * @param state  a serialized byte[][] array where element 0 is the
       *                   transient state (or null) , and element 1 is the
       *                   persistent state (or null)
       * @param targetRoot node into which the state should be integrated
  
  
  



More information about the jboss-cvs-commits mailing list