This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 96ee000b9a Fix a regression in 6353e786 96ee000b9a is described below commit 96ee000b9ad61d123bf3889e5152f668a36006ee Author: lihan <li...@apache.org> AuthorDate: Thu Aug 10 15:48:56 2023 +0800 Fix a regression in 6353e786 --- java/org/apache/catalina/mapper/Mapper.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/mapper/Mapper.java b/java/org/apache/catalina/mapper/Mapper.java index 70e428b45b..0a5690704b 100644 --- a/java/org/apache/catalina/mapper/Mapper.java +++ b/java/org/apache/catalina/mapper/Mapper.java @@ -1320,7 +1320,8 @@ public final class Mapper { private static int compare(CharChunk name, int start, int end, String compareTo) { int result = 0; char[] c = name.getBuffer(); - int len = compareTo.length(); + int compareLen = compareTo.length(); + int len = compareLen; if ((end - start) < len) { len = end - start; } @@ -1334,9 +1335,9 @@ public final class Mapper { } } if (result == 0) { - if (len > (end - start)) { + if (compareLen > (end - start)) { result = -1; - } else if (len < (end - start)) { + } else if (compareLen < (end - start)) { result = 1; } } @@ -1351,7 +1352,8 @@ public final class Mapper { private static int compareIgnoreCase(CharChunk name, int start, int end, String compareTo) { int result = 0; char[] c = name.getBuffer(); - int len = compareTo.length(); + int compareLen = compareTo.length(); + int len = compareLen; if ((end - start) < len) { len = end - start; } @@ -1365,9 +1367,9 @@ public final class Mapper { } } if (result == 0) { - if (len > (end - start)) { + if (compareLen > (end - start)) { result = -1; - } else if (len < (end - start)) { + } else if (compareLen < (end - start)) { result = 1; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org