#3 refactoring

oleg-cherednik · Oct 28, 2024 · 8db49ae · 8db49ae
1 parent 04872d4
commit 8db49ae
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/Bzip2EntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/Bzip2EntryOutputStream.java
@@ -49,6 +49,7 @@ public void write(byte[] buf, int offs, int len) throws IOException {
     @Override
     public void close() throws IOException {
         bzip2.close();
+        encoderDataOutput.encodingAccomplished();
         super.close();
     }
 

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/DeflateEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/DeflateEntryOutputStream.java
@@ -91,6 +91,7 @@ private void finish() throws IOException {
     @Override
     public void close() throws IOException {
         finish();
+        encoderDataOutput.encodingAccomplished();
         super.close();
     }
 }
diff --git a/...main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/EncryptedEntryOutputStream.java b/...main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/EncryptedEntryOutputStream.java
@@ -78,7 +78,7 @@ public void write(byte[] buf, int offs, int len) throws IOException {
 
     @Override
     public void close() throws IOException {
-        encoderDataOutput.encodingAccomplished();
+        //encoderDataOutput.encodingAccomplished();
         emos.close();
     }
 

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/LzmaEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/LzmaEntryOutputStream.java
@@ -70,6 +70,7 @@ public void write(byte[] buf, int offs, int len) throws IOException {
     @Override
     public void close() throws IOException {
         lzma.close();
+        encoderDataOutput.encodingAccomplished();
         super.close();
     }
 

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/StoreEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/StoreEntryOutputStream.java
@@ -39,4 +39,10 @@ public void write(byte[] buf, int offs, int len) throws IOException {
         encoderDataOutput.write(buf, offs, len);
     }
 
+    @Override
+    public void close() throws IOException {
+        encoderDataOutput.encodingAccomplished();
+        super.close();
+    }
+
 }
diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/ZstdEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/ZstdEntryOutputStream.java
@@ -49,6 +49,7 @@ public void write(byte[] buf, int offs, int len) throws IOException {
     @Override
     public void close() throws IOException {
         zstd.close();
+        encoderDataOutput.encodingAccomplished();
         super.close();
     }