This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push: new 4d3f1bdbf3 Fix a regression in 6353e786 4d3f1bdbf3 is described below commit 4d3f1bdbf3e7a626edfea97f1b2853ee27076264 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 b1c87e1070..f73e7429b5 100644 --- a/java/org/apache/catalina/mapper/Mapper.java +++ b/java/org/apache/catalina/mapper/Mapper.java @@ -1314,7 +1314,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; } @@ -1328,9 +1329,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; } } @@ -1345,7 +1346,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; } @@ -1359,9 +1361,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