From 4ca1ae688fea9308f213fda3b7090ebfd5445834 Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Sat, 16 Apr 2022 23:32:26 +0200 Subject: [PATCH] Avoid calculations the minimum or the maximum of two numbers manually.Use Math.max() or Math.min(). --- src/main/java/org/apache/commons/codec/binary/BaseNCodec.java | 4 +--- src/main/java/org/apache/commons/codec/digest/Md5Crypt.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java index 6595c0bbeb..d74e2f547c 100644 --- a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java +++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java @@ -232,9 +232,7 @@ private static int createPositiveCapacity(final int minCapacity) { // Integer.MAX_VALUE length array. // The result is that we may have to allocate an array of this size more than once if // the capacity must be expanded again. - return (minCapacity > MAX_BUFFER_SIZE) ? - minCapacity : - MAX_BUFFER_SIZE; + return Math.max(minCapacity, MAX_BUFFER_SIZE); } /** diff --git a/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java b/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java index 82011a2dfd..2c1802aeab 100644 --- a/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java +++ b/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java @@ -323,7 +323,7 @@ public static String md5Crypt(final byte[] keyBytes, final String salt, final St byte[] finalb = ctx1.digest(); int ii = keyLen; while (ii > 0) { - ctx.update(finalb, 0, ii > 16 ? 16 : ii); + ctx.update(finalb, 0, Math.min(ii, 16)); ii -= 16; }