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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 07/07/09 10:46:02

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  [JBCACHE-1123] - Non-streaming state transfer failures not properly handled
  
  Revision  Changes    Path
  1.100     +8 -8      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.99
  retrieving revision 1.100
  diff -u -b -r1.99 -r1.100
  --- CacheImpl.java	3 Jul 2007 11:57:48 -0000	1.99
  +++ CacheImpl.java	9 Jul 2007 14:46:02 -0000	1.100
  @@ -3397,13 +3397,12 @@
         {
            MarshalledValueOutputStream out = null;
            byte[] result = null;
  +         ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
            try
            {
  -            ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
               out = new MarshalledValueOutputStream(baos);
   
               getStateTransferManager().getState(out, Fqn.ROOT, configuration.getStateRetrievalTimeout(), true, true);
  -            result = baos.getRawBuffer();
            }
            catch (Throwable t)
            {
  @@ -3411,6 +3410,7 @@
            }
            finally
            {
  +        	result = baos.getRawBuffer();
               Util.close(out);
            }
            return result;
  @@ -3458,14 +3458,13 @@
               sourceRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMITER)[0];
            }
   
  +         ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
            try
            {
  -            ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
               out = new MarshalledValueOutputStream(baos);
   
               getStateTransferManager().getState(out, Fqn.fromString(sourceRoot),
                       configuration.getStateRetrievalTimeout(), true, true);
  -            result = baos.getRawBuffer();
            }
            catch (Throwable t)
            {
  @@ -3473,6 +3472,7 @@
            }
            finally
            {
  +        	result = baos.getRawBuffer();
               Util.close(out);
            }
            return result;