postgresql-jdbc.git / summary / log / commit / refs

commit    da19fcbee95fbe479dad44152a9fd9d8825f007a
Author:   slmsbrhgn <slmsbrhgn@gmail.com>
Commit:   Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date:     Wed Apr 05 11:17:15 2017 +0000

    fix: corrections to previous commit


 .../src/main/java/org/postgresql/util/ReaderInputStream.java |  4 ++--
 .../test/java/org/postgresql/util/ReaderInputStreamTest.java | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pgjdbc/src/main/java/org/postgresql/util/ReaderInputStream.java b/pgjdbc/src/main/java/org/postgresql/util/ReaderInputStream.java
index 77151e57..643401c7 100644
--- a/pgjdbc/src/main/java/org/postgresql/util/ReaderInputStream.java
+++ b/pgjdbc/src/main/java/org/postgresql/util/ReaderInputStream.java
@@ -142,13 +142,13 @@ public class ReaderInputStream extends InputStream {
         totalRead += remaining;
         off += remaining;
         len -= remaining;
-        if (len >= 0) {
+        if (len == 0) {
           return totalRead;
         }
       }
       advance();
     }
-    if (endOfInput && !bbuf.hasRemaining()) {
+    if (endOfInput && !bbuf.hasRemaining() && totalRead == 0) {
       return -1;
     }
     return totalRead;
diff --git a/pgjdbc/src/test/java/org/postgresql/util/ReaderInputStreamTest.java b/pgjdbc/src/test/java/org/postgresql/util/ReaderInputStreamTest.java
index 9bef549e..5fb180fa 100644
--- a/pgjdbc/src/test/java/org/postgresql/util/ReaderInputStreamTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/util/ReaderInputStreamTest.java
@@ -9,7 +9,13 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
 import java.nio.charset.MalformedInputException;
 import java.util.Arrays;
 
@@ -197,11 +203,7 @@ public class ReaderInputStreamTest {
     int total = 0;
 
     while ((read = r.read(buffer, 0, BLOCK)) > -1) {
-      // System.out.println(String.format("Read: %4d  Start: %3d  End: %3d", read, buffer[0], buffer[read - 1]));
       total += read;
-      if (read == BLOCK) {
-        assertEquals("Byte values are not correct", buffer[0], buffer[read % BLOCK]);
-      }
     }
 
     assertEquals("Data not read completely: missing " + (DATASIZE - total) + " bytes", total, DATASIZE);


[parent: 28c98418b576]