This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit c1a7fb9892884523440bb46b4b18ae6614671f2f Author: Gary Gregory <[email protected]> AuthorDate: Sat Jul 25 08:13:04 2026 -0400 Merge if statements with the same return value. --- src/main/java/org/apache/commons/lang3/Strings.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/Strings.java b/src/main/java/org/apache/commons/lang3/Strings.java index 3c7b229a5..5fce16c14 100644 --- a/src/main/java/org/apache/commons/lang3/Strings.java +++ b/src/main/java/org/apache/commons/lang3/Strings.java @@ -129,10 +129,7 @@ public boolean equals(final CharSequence cs1, final CharSequence cs2) { if (cs1 == cs2) { return true; } - if (cs1 == null || cs2 == null) { - return false; - } - if (cs1.length() != cs2.length()) { + if (cs1 == null || cs2 == null || cs1.length() != cs2.length()) { return false; } return CharSequenceUtils.regionMatches(cs1, true, 0, cs2, 0, cs1.length()); @@ -226,10 +223,7 @@ public boolean equals(final CharSequence cs1, final CharSequence cs2) { if (cs1 == cs2) { return true; } - if (cs1 == null || cs2 == null) { - return false; - } - if (cs1.length() != cs2.length()) { + if (cs1 == null || cs2 == null || cs1.length() != cs2.length()) { return false; } if (cs1 instanceof String && cs2 instanceof String) { @@ -335,7 +329,7 @@ private static boolean eq(final Object o1, final Object o2) { static int initialCapacity(final int textLen, final int searchLen, final int replacementLen, final int max) { final long perReplacementGrowth = Math.max((long) replacementLen - searchLen, 0L); final long totalGrowth = perReplacementGrowth * (max < 0 ? 16 : Math.min(max, 64)); - return (int) Math.min((long) textLen + totalGrowth, ArrayUtils.SAFE_MAX_ARRAY_LENGTH); + return (int) Math.min(textLen + totalGrowth, ArrayUtils.SAFE_MAX_ARRAY_LENGTH); } /**
