Move readHeader/writeHeader check

flanglet · Sep 14, 2024 · 263cae4 · 263cae4
1 parent 5b9981a
commit 263cae4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/java/src/main/java/kanzi/io/CompressedInputStream.java b/java/src/main/java/kanzi/io/CompressedInputStream.java
@@ -168,6 +168,9 @@ public CompressedInputStream(InputBitStream ibs, Map<String, Object> ctx)
 
    protected void readHeader() throws IOException
    {
+      if ((this.headless == true) || (this.initialized.getAndSet(true) == true))
+          return;
+
       // Read stream type
       final int type = (int) this.ibs.readBits(32);
 
@@ -472,8 +475,7 @@ public int read(byte[] data, int off, int len) throws IOException
 
    private int processBlock() throws IOException
    {
-      if ((this.headless == false) && (this.initialized.getAndSet(true)== false))
-         this.readHeader();
+      this.readHeader();
 
       try
       {

diff --git a/java/src/main/java/kanzi/io/CompressedOutputStream.java b/java/src/main/java/kanzi/io/CompressedOutputStream.java
@@ -167,6 +167,9 @@ public CompressedOutputStream(OutputBitStream obs, Map<String, Object> ctx)
 
    protected void writeHeader() throws IOException
    {
+      if ((this.headless == true) || (this.initialized.getAndSet(true) == true))
+         return;
+
       if (this.obs.writeBits(BITSTREAM_TYPE, 32) != 32)
          throw new kanzi.io.IOException("Cannot write bitstream type to header", Error.ERR_WRITE_FILE);
 
@@ -451,8 +454,7 @@ public void close() throws IOException
 
    private void processBlock() throws IOException
    {
-      if ((this.headless == false) && (this.initialized.getAndSet(true) == false))
-         this.writeHeader();
+      this.writeHeader();
 
       if (this.buffers[0].index == 0)
          return;