From f1e5e17d50a76928c1c8760815fd10cdcd15703a Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 22 Oct 2015 15:50:19 +0000
Subject: [PATCH] StreamLogger bug fix and added new line to JSONWriter flush
 function

---
 src/zutil/log/InputStreamLogger.java  |  4 +--
 src/zutil/log/StreamLogger.java       | 37 +++++++++++----------------
 src/zutil/parser/json/JSONWriter.java |  1 +
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/zutil/log/InputStreamLogger.java b/src/zutil/log/InputStreamLogger.java
index 849b9bc..99c54bc 100644
--- a/src/zutil/log/InputStreamLogger.java
+++ b/src/zutil/log/InputStreamLogger.java
@@ -42,12 +42,12 @@ public class InputStreamLogger extends InputStream implements StreamLogger.LogCa
     }
     public int read(byte b[]) throws IOException {
         int n = in.read(b);
-        log.log(b, 0, b.length);
+        log.log(b, 0, n);
         return n;
     }
     public int read(byte b[], int off, int len) throws IOException {
         int n = in.read(b, off, len);
-        log.log(b, off, len);
+        log.log(b, off, n);
         return n;
     }
     public long skip(long n) throws IOException {
diff --git a/src/zutil/log/StreamLogger.java b/src/zutil/log/StreamLogger.java
index c20e3d1..79bf285 100644
--- a/src/zutil/log/StreamLogger.java
+++ b/src/zutil/log/StreamLogger.java
@@ -30,7 +30,7 @@ public class StreamLogger {
 
 
     protected void log(int n){
-        if(n == DELIMETER)
+        if(n < 0 || n == DELIMETER)
             flushLog();
         else
             buffer.append(n);
@@ -38,33 +38,26 @@ public class StreamLogger {
             flushLog();
     }
     protected void log(byte[] b, int off, int len){
-        try {
-            if (logger.isLoggable()) {
-                for(int i=0; i<len; ++i){
-                    if(b[off+i] == DELIMETER){
-                        buffer.append(new String(b, off, i, "UTF-8"));
-                        flushLog();
-                        off += i;
-                        len -= i;
-                        i = 0;
-                    }
-                }
-                if(len > 0)
-                    buffer.append(new String(b, off, len, "UTF-8"));
-                if(buffer.length() > MAX_BUFFER_SIZE)
+        if (logger.isLoggable()) {
+            for(int i=0; i<len; ++i){
+                if(b[off+i] == DELIMETER)
                     flushLog();
+                else
+                    buffer.append((char)b[off+i]);
             }
-        } catch (UnsupportedEncodingException e){
-            e.printStackTrace();
+            if(buffer.length() > MAX_BUFFER_SIZE)
+                flushLog();
         }
     }
 
     protected void flushLog(){
-        if(prefix != null)
-            logger.log(prefix + ": " + buffer.toString());
-        else
-            logger.log(buffer.toString());
-        clearLog();
+        if(buffer.length() > 0) {
+            if (prefix != null)
+                logger.log(prefix + ": " + buffer.toString());
+            else
+                logger.log(buffer.toString());
+            clearLog();
+        }
     }
     protected void clearLog(){
         buffer.delete(0, buffer.length());
diff --git a/src/zutil/parser/json/JSONWriter.java b/src/zutil/parser/json/JSONWriter.java
index aecd0a2..4c5e9be 100644
--- a/src/zutil/parser/json/JSONWriter.java
+++ b/src/zutil/parser/json/JSONWriter.java
@@ -144,6 +144,7 @@ public class JSONWriter{
     }
 
     public void flush(){
+        out.print("\n");
         out.flush();
     }
 }