Merge branch 'master' into streamify

[nikiroo-utils.git] / src / be / nikiroo / utils / Base64.java

diff --git a/src/be/nikiroo/utils/Base64.java b/src/be/nikiroo/utils/Base64.java
index 476160182475a7d51850a64dafef25ea576782a1..784fc929aef19b9f51c3dcb9f891cb9bb59e3122 100644 (file)
--- a/src/be/nikiroo/utils/Base64.java
+++ b/src/be/nikiroo/utils/Base64.java
@@ -1,5 +1,7 @@
 package be.nikiroo.utils;
 
+import java.io.IOException;
+
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
  * <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>
@@ -2029,7 +2031,9 @@ class Base64
         @Override
         public void close() throws java.io.IOException {
             // 1. Ensure that pending characters are written
-            flushBase64();
+            
+               // niki: removed since it is now in flush()
+               //flushBase64();
 
             // 2. Actually close the stream
             // Base class both flushes and closes.
@@ -2066,7 +2070,12 @@ class Base64
             this.suspendEncoding = false;
         }   // end resumeEncoding
         
-        
+        @Override
+        // added by niki
+        public void flush() throws IOException {
+               flushBase64();
+               super.flush();
+        }
         
     }   // end inner class OutputStream