Update WriterOutputStream, re #6

libj · Mar 9, 2023 · 3e5d7e1 · 3e5d7e1
1 parent 7812166
commit 3e5d7e1
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/main/java/org/libj/io/WriterOutputStream.java b/src/main/java/org/libj/io/WriterOutputStream.java
@@ -185,7 +185,7 @@ public void write(final byte[] b, int off, int len) throws IOException {
     }
 
     if (flushImmediately)
-      flush();
+      flushBuffer();
   }
 
   @Override
@@ -199,7 +199,7 @@ public void write(final int b) throws IOException {
     processInput(false);
 
     if (flushImmediately)
-      flush();
+      flushBuffer();
   }
 
   /**
@@ -209,11 +209,7 @@ public void write(final int b) throws IOException {
    */
   @Override
   public void flush() throws IOException {
-    if (decoderOut.position() <= 0)
-      return;
-
-    writer.write(decoderOut.array(), 0, decoderOut.position());
-    decoderOut.rewind();
+    flushBuffer();
     writer.flush();
   }
 
@@ -226,10 +222,18 @@ public void flush() throws IOException {
   @Override
   public void close() throws IOException {
     processInput(true);
-    flush();
+    flushBuffer();
     writer.close();
   }
 
+  protected void flushBuffer() throws IOException {
+    final int pos = decoderOut.position();
+    if (pos > 0) {
+      writer.write(decoderOut.array(), 0, pos);
+      decoderOut.rewind();
+    }
+  }
+
   /**
    * Decode the contents of the input ByteBuffer into a CharBuffer.
    *
@@ -241,7 +245,7 @@ private void processInput(final boolean endOfInput) throws IOException {
     for (CoderResult coderResult;;) {
       coderResult = decoder.decode(decoderIn, decoderOut, endOfInput);
       if (coderResult.isOverflow()) {
-        flush();
+        flushBuffer();
       }
       else if (coderResult.isUnderflow()) {
         break;