This is an automated email from the ASF dual-hosted git repository.
markt 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 0e7b871 Code clean-up. Remove unnecessary code.
0e7b871 is described below
commit 0e7b8712c4decdc11994679d9d4e93746a45ab9a
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 27 08:22:28 2021 +0100
Code clean-up. Remove unnecessary code.
---
java/javax/servlet/http/HttpUtils.java | 2 +-
java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 3 +--
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 +-
.../apache/catalina/webresources/AbstractArchiveResourceSet.java | 2 +-
java/org/apache/jasper/compiler/JspUtil.java | 4 ++--
test/org/apache/tomcat/util/buf/TestUtf8.java | 6 +++---
webapps/examples/WEB-INF/classes/util/CookieFilter.java | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/java/javax/servlet/http/HttpUtils.java
b/java/javax/servlet/http/HttpUtils.java
index 405ab83..3305cd1 100644
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -99,7 +99,7 @@ public class HttpUtils {
throw new IllegalArgumentException();
}
String key = parseName(pair.substring(0, pos), sb);
- String val = parseName(pair.substring(pos+1, pair.length()), sb);
+ String val = parseName(pair.substring(pos+1), sb);
if (ht.containsKey(key)) {
String oldVals[] = ht.get(key);
valArray = Arrays.copyOf(oldVals, oldVals.length + 1);
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 055fa74..bfde34a 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -273,8 +273,7 @@ public class JvmRouteBinderValve extends ValveBase
implements ClusterValve {
String requestJvmRoute = null;
int index = sessionId.indexOf('.');
if (index > 0) {
- requestJvmRoute = sessionId
- .substring(index + 1, sessionId.length());
+ requestJvmRoute = sessionId.substring(index + 1);
}
if (requestJvmRoute != null && !requestJvmRoute.equals(localJvmRoute))
{
if (log.isDebugEnabled()) {
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 50d78db..2fa3e8d 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -143,7 +143,7 @@ public class Substitution {
if (percentPos == -1 && dollarPos == -1 && backslashPos == -1) {
// Static text
StaticElement newElement = new StaticElement();
- newElement.value = sub.substring(pos, sub.length());
+ newElement.value = sub.substring(pos);
pos = sub.length();
elements.add(newElement);
} else if (isFirstPos(backslashPos, dollarPos, percentPos)) {
diff --git
a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
index 23adb9a..1b80cc8 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
@@ -232,7 +232,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
if (path.startsWith(webAppMount)) {
String pathInJar = getInternalPath() + path.substring(
- webAppMount.length(), path.length());
+ webAppMount.length());
// Always strip off the leading '/' to get the JAR path
if (pathInJar.length() > 0 && pathInJar.charAt(0) == '/') {
pathInJar = pathInJar.substring(1);
diff --git a/java/org/apache/jasper/compiler/JspUtil.java
b/java/org/apache/jasper/compiler/JspUtil.java
index 9d723e9..1b45ae4 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -667,7 +667,7 @@ public class JspUtil {
InputStream in = null;
if (jar != null) {
- String jarEntryName = fname.substring(1, fname.length());
+ String jarEntryName = fname.substring(1);
in = jar.getInputStream(jarEntryName);
} else {
in = ctxt.getResourceAsStream(fname);
@@ -685,7 +685,7 @@ public class JspUtil {
throws IOException {
InputSource source;
if (jar != null) {
- String jarEntryName = fname.substring(1, fname.length());
+ String jarEntryName = fname.substring(1);
source = new InputSource(jar.getInputStream(jarEntryName));
source.setSystemId(jar.getURL(jarEntryName));
} else {
diff --git a/test/org/apache/tomcat/util/buf/TestUtf8.java
b/test/org/apache/tomcat/util/buf/TestUtf8.java
index 6673cbb..ef097d7 100644
--- a/test/org/apache/tomcat/util/buf/TestUtf8.java
+++ b/test/org/apache/tomcat/util/buf/TestUtf8.java
@@ -631,17 +631,17 @@ public class TestUtf8 {
if ((flags & REPLACE_MISSING1) != 0) {
expected = expected.substring(0, 1) +
- expected.substring(2, expected.length());
+ expected.substring(2);
}
if ((flags & REPLACE_MISSING2) != 0) {
expected = expected.substring(0, 1) +
- expected.substring(3, expected.length());
+ expected.substring(3);
}
if ((flags & REPLACE_MISSING4) != 0) {
expected = expected.substring(0, 1) +
- expected.substring(5, expected.length());
+ expected.substring(5);
}
Assert.assertEquals(testCase.description, expected, cb.toString());
diff --git a/webapps/examples/WEB-INF/classes/util/CookieFilter.java
b/webapps/examples/WEB-INF/classes/util/CookieFilter.java
index 19243ee..d7c8550 100644
--- a/webapps/examples/WEB-INF/classes/util/CookieFilter.java
+++ b/webapps/examples/WEB-INF/classes/util/CookieFilter.java
@@ -69,7 +69,7 @@ public class CookieFilter {
return input;
}
String name = input.substring(0, i);
- String value = input.substring(i + 1, input.length());
+ String value = input.substring(i + 1);
return name + "=" + filter(name, value, sessionId);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
