This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5623b08fac Fix a regression in 6353e786
5623b08fac is described below
commit 5623b08fac963514c6793fda0aca743a876924a3
Author: lihan <[email protected]>
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 d2d3b4635e..a1f9d19257 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -1319,7 +1319,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;
}
@@ -1333,9 +1334,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;
}
}
@@ -1350,7 +1351,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;
}
@@ -1364,9 +1366,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: [email protected]
For additional commands, e-mail: [email protected]
