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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/12/20 17:28:13

  Modified:    src/org/jboss/cache/buddyreplication  BuddyManager.java
  Log:
  final state transfer refactoring
  
  Revision  Changes    Path
  1.50      +19 -2     JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- BuddyManager.java	8 Dec 2006 18:49:18 -0000	1.49
  +++ BuddyManager.java	20 Dec 2006 22:28:13 -0000	1.50
  @@ -21,10 +21,12 @@
   import org.jboss.cache.marshall.MethodDeclarations;
   import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.statetransfer.StateTransferManager;
  +import org.jboss.util.stream.MarshalledValueInputStream;
   import org.jgroups.Address;
   import org.jgroups.View;
   import org.jgroups.stack.IpAddress;
   
  +import java.io.ByteArrayInputStream;
   import java.util.ArrayList;
   import java.util.Arrays;
   import java.util.Collection;
  @@ -397,7 +399,22 @@
            {
               ClassLoader cl = (marshaller == null) ? null : marshaller.getClassLoader(fqnS);
               Fqn integrationRoot = new Fqn(integrationBase, fqn);
  -            stateMgr.setState((byte[]) entry.getValue(), integrationRoot, cl);
  +            
  +            byte [] stateBuffer = (byte[]) entry.getValue();
  +            MarshalledValueInputStream in = null;
  +            try
  +            {
  +               ByteArrayInputStream bais = new ByteArrayInputStream(stateBuffer);
  +               in = new MarshalledValueInputStream(bais);
  +               stateMgr.setState(in, integrationRoot, cl);
  +            }
  +            finally
  +            {
  +               if (in != null)
  +               {
  +                  in.close();
  +               }
  +            }
            }
         }
      }
  @@ -620,7 +637,7 @@
   
            try
            {
  -            byte[] state = cache._getState(fqn, timeouts[i], force, false);
  +            byte[] state = cache.generateState(fqn, timeouts[i], force, false);
               if (log.isDebugEnabled())
               {
                  log.debug("acquireState(): got state");