You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by tm...@apache.org on 2006/06/13 16:07:22 UTC
svn commit: r413901 -
/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java
Author: tmnk
Date: Tue Jun 13 07:07:22 2006
New Revision: 413901
URL: http://svn.apache.org/viewvc?rev=413901&view=rev
Log:
- DERBY-1396 ReEncodedInputStream may fail to read all of source Reader - Patch by Tomohito Nakayama (tomonaka@basil.ocn.ne.jp)
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java?rev=413901&r1=413900&r2=413901&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java Tue Jun 13 07:07:22 2006
@@ -72,10 +72,14 @@
throws IOException
{
- int count;
- if(( count = reader.read(decodedBuffer_, 0, BUFFERED_CHAR_LEN )) < 1 ){
- return null;
- }
+ int count;
+ do{
+ count = reader.read(decodedBuffer_, 0, BUFFERED_CHAR_LEN);
+
+ }while(count == 0);
+
+ if(count < 0)
+ return null;
encodedOutputStream_.reset();
encodedStreamWriter_.write(decodedBuffer_,0,count);