[commons-compress] branch master updated: Extract conditions and avoid duplicate code. (#297)

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new 2643ef6a Extract conditions and avoid duplicate code. (#297)
2643ef6a is described below

commit 2643ef6a351b1812c18890d8343d13ddf42f1b69
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat Dec 10 17:02:38 2022 +0100

    Extract conditions and avoid duplicate code. (#297)
---
 .../java/org/apache/commons/compress/compressors/bzip2/BlockSort.java | 3 +--
 .../java/org/apache/commons/compress/harmony/unpack200/BandSet.java   | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java 
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
index 3f42b844..88fc1cf7 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
@@ -874,7 +874,6 @@ class BlockSort {
                     stack_ll[sp] = lo;
                     stack_hh[sp] = hi;
                     stack_dd[sp] = d1;
-                    sp++;
                 } else {
                     int n = Math.min(ltLo - lo, unLo - ltLo);
                     vswap(fmap, lo, unLo - n, n);
@@ -897,8 +896,8 @@ class BlockSort {
                     stack_ll[sp] = m;
                     stack_hh[sp] = hi;
                     stack_dd[sp] = d;
-                    sp++;
                 }
+                sp++;
             }
         }
     }
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
index f1a304fc..80ca7a0f 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
@@ -188,10 +188,8 @@ public abstract class BandSet {
         int[] lo;
         if (hiCodec != null) {
             hi = decodeBandInt(name, in, hiCodec, sum);
-            lo = decodeBandInt(name, in, loCodec, sum);
-        } else {
-            lo = decodeBandInt(name, in, loCodec, sum);
         }
+        lo = decodeBandInt(name, in, loCodec, sum);
 
         int index = 0;
         for (int i = 0; i < result.length; i++) {