added Log.setThreadAnnotation()

[org.ibex.core.git] / src / org / ibex / util / LineReader.java

diff --git a/src/org/ibex/util/LineReader.java b/src/org/ibex/util/LineReader.java
index 88b785d..972dfe5 100644 (file)
--- a/src/org/ibex/util/LineReader.java
+++ b/src/org/ibex/util/LineReader.java
@@ -22,16 +22,18 @@ public class LineReader {
                     if (buf[i-1] == '\r') ret = new String(buf, 0, i-1);
                     else ret = new String(buf, 0, i);
                     System.arraycopy(buf, i+1, buf, 0, buflen - (i+1));
-                    buflen -= i;
+                    buflen -= i+1;
                     return ret;
                 }
             }
             int numread = r.read(buf, buflen, MAXBUF - buflen);
-            if (numread == 0) {
+            if (numread == -1) {
                 if (buflen == 0) return null;
                 String ret = new String(buf, 0, buflen);
                 buflen = 0;
                 return ret;
+            } else {
+                buflen += numread;
             }
         }
     }