commit a35dc1e9b4b5c5003f9a082f7ed2a3cbfb0fde76
author Cezar Cristian Andrei <cezar@apache.org> Wed Oct 20 21:52:40 2010 +0000
committer Cezar Cristian Andrei <cezar@apache.org> Wed Oct 20 21:52:40 2010 +0000
tree bb6120920db3597f3c49507d21eacaa2049d6ccd
parent 9ec0a0862b85f4f12f0eba7b0a892e63dbd17c29

Fix bug when resizing circular buffer in saver's output stream implementation.

checkintests pass, no regressions in detailed.


git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1025773 13f79535-47bb-0310-9956-ffa450edef68

src/store/org/apache/xmlbeans/impl/store/Saver.java

diff --git a/src/store/org/apache/xmlbeans/impl/store/Saver.java b/src/store/org/apache/xmlbeans/impl/store/Saver.java
index fe8d543..1344aaa 100755
--- a/src/store/org/apache/xmlbeans/impl/store/Saver.java
+++ b/src/store/org/apache/xmlbeans/impl/store/Saver.java
@@ -2594,10 +2594,10 @@
                             _buf, 0, bbuf, off + chunk, len - chunk );
                     }
                 }
-//System.out.println("------------------------\nRead out of queue: Saver:2440 InputStreamSaver.read() bbuf   " + len + " bytes :\n" + new String(bbuf, off, len));
                 _out = (_out + len) % _buf.length;
                 _free += len;
 
+//System.out.println("------------------------\nRead out of queue: Saver:2440 InputStreamSaver.read() bbuf   " + len + " bytes :\n" + new String(bbuf, off, len));
                 return len;
             }
 
@@ -2636,9 +2636,9 @@
                     _in = _out = 0;
                 }
 
-                int chunk;
+                int chunk = _buf.length - _in;
 
-                if (_in <= _out || cbyte < (chunk = _buf.length - _in))
+                if (_in <= _out || cbyte < chunk)
                 {
                     System.arraycopy( buf, off, _buf, _in, cbyte );
                     _in += cbyte;
@@ -2658,7 +2658,7 @@
 
             void resize ( int cbyte )
             {
-                assert cbyte > _free;
+                assert cbyte > _free : cbyte + " !> " + _free;
 
                 int newLen = _buf == null ? _initialBufSize : _buf.length * 2;
                 int used = getAvailable();
@@ -2670,9 +2670,7 @@
 
                 if (used > 0)
                 {
-                    if (_out == _in)
-                        System.arraycopy( _buf, 0, newBuf, 0, used );
-                    else if (_in > _out)
+                    if (_in > _out)
                         System.arraycopy( _buf, _out, newBuf, 0, used );
                     else
                     {
@@ -2698,10 +2696,10 @@
 
             private static final int _initialBufSize = 4096;
 
-            int    _free;
-            int    _in;
-            int    _out;
-            byte[] _buf;
+            private int    _free;
+            private int    _in;
+            private int    _out;
+            private byte[] _buf;
         }
 
         private Locale             _locale;
@@ -4363,13 +4361,13 @@
 
         XmlDocumentProperties getDocProps ( ) { return _cur.getDocProps(); }
 
-        final static void spaces ( StringBuffer sb, int offset, int count )
+        static void spaces ( StringBuffer sb, int offset, int count )
         {
             while ( count-- > 0 )
                 sb.insert( offset, ' ' );
         }
 
-        final static void trim ( StringBuffer sb )
+        static void trim ( StringBuffer sb )
         {
             int i;