[jboss-remoting-commits] JBoss Remoting SVN: r6142 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2010-11-12 19:48:45 -0500 (Fri, 12 Nov 2010)
New Revision: 6142

Modified:
   remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java
Log:
JBREM-1252: (1) Added byteBuffer.flip() and charBuffer.flip() to the constructor; (2) fixed fill().

Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java	2010-11-13 00:21:50 UTC (rev 6141)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java	2010-11-13 00:48:45 UTC (rev 6142)
@@ -98,6 +98,8 @@
         this.encoder = encoder;
         charBuffer = CharBuffer.wrap(new char[bufferSize]);
         byteBuffer = ByteBuffer.wrap(new byte[(int) ((float)bufferSize * encoder.averageBytesPerChar() + 0.5f)]);
+        charBuffer.flip();
+        byteBuffer.flip();
     }
 
     private static CharsetEncoder getEncoder(final Charset charset) {
@@ -165,7 +167,7 @@
                 try {
                     final int cnt = reader.read(charBuffer);
                     if (cnt == -1) {
-                        return false;
+                       return byteBuffer.position() > 0;
                     }
                 } finally {
                     charBuffer.flip();