(commons-codec) 02/02: Merge if tests that do the same block

[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-codec.git

commit ba343294fcdc0c439156eefe55e7ed9ae963db34
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 27 10:27:36 2024 -0500

    Merge if tests that do the same block
---
 .../java/org/apache/commons/codec/binary/BaseNCodecInputStream.java  | 5 +----
 .../java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java 
b/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
index 74bfb07f..5c39ab49 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
@@ -156,10 +156,7 @@ public class BaseNCodecInputStream extends 
FilterInputStream {
     @Override
     public int read(final byte[] array, final int offset, final int len) 
throws IOException {
         Objects.requireNonNull(array, "array");
-        if (offset < 0 || len < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        if (offset > array.length || offset + len > array.length) {
+        if (offset < 0 || len < 0 || offset > array.length || offset + len > 
array.length) {
             throw new IndexOutOfBoundsException();
         }
         if (len == 0) {
diff --git 
a/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java 
b/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
index 19647593..71d4b72d 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
@@ -166,10 +166,7 @@ public class BaseNCodecOutputStream extends 
FilterOutputStream {
     @Override
     public void write(final byte[] array, final int offset, final int len) 
throws IOException {
         Objects.requireNonNull(array, "array");
-        if (offset < 0 || len < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        if (offset > array.length || offset + len > array.length) {
+        if (offset < 0 || len < 0 || offset > array.length || offset + len > 
array.length) {
             throw new IndexOutOfBoundsException();
         }
         if (len > 0) {