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
commit b8e9c49e588c21ca64d07f9990267eace1cbbcbc
Author: lihan <li...@apache.org>
AuthorDate: Fri Feb 17 11:30:53 2023 +0800
Many improvements.
---
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 6 +-----
java/org/apache/coyote/ajp/AjpMessage.java | 2 +-
.../apache/tomcat/util/digester/CallMethodRule.java | 20 ++++++--------------
java/org/apache/tomcat/util/json/JSONFilter.java | 4 ++--
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
.../tomcat/util/scan/AbstractInputStreamJar.java | 4 ++--
6 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 89d51b40ee..14c0848462 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -204,11 +204,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
private int packetSize = Constants.MAX_PACKET_SIZE;
public int getPacketSize() { return packetSize; }
public void setPacketSize(int packetSize) {
- if(packetSize < Constants.MAX_PACKET_SIZE) {
- this.packetSize = Constants.MAX_PACKET_SIZE;
- } else {
- this.packetSize = packetSize;
- }
+ this.packetSize = Math.max(packetSize, Constants.MAX_PACKET_SIZE);
}
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java
b/java/org/apache/coyote/ajp/AjpMessage.java
index 14d7e53cb9..f49a099125 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -398,7 +398,7 @@ public class AjpMessage {
StringBuilder sb = new StringBuilder();
for (int i = start; i < start + 16 ; i++) {
if (i < len + 4) {
- sb.append(hex(buf[i]) + " ");
+ sb.append(hex(buf[i])).append(" ");
} else {
sb.append(" ");
}
diff --git a/java/org/apache/tomcat/util/digester/CallMethodRule.java
b/java/org/apache/tomcat/util/digester/CallMethodRule.java
index 3ba2391716..60e7382ee0 100644
--- a/java/org/apache/tomcat/util/digester/CallMethodRule.java
+++ b/java/org/apache/tomcat/util/digester/CallMethodRule.java
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.util.digester;
+import java.util.Arrays;
import org.apache.tomcat.util.IntrospectionUtils;
import org.xml.sax.Attributes;
@@ -102,9 +103,7 @@ public class CallMethodRule extends Rule {
this.paramTypes = new Class[] { String.class };
} else {
this.paramTypes = new Class[paramCount];
- for (int i = 0; i < this.paramTypes.length; i++) {
- this.paramTypes[i] = String.class;
- }
+ Arrays.fill(this.paramTypes, String.class);
}
this.paramClassNames = null;
}
@@ -142,19 +141,15 @@ public class CallMethodRule extends Rule {
* Java wrapper class instead, such as <code>java.lang.Boolean.TYPE</code>
* for a <code>boolean</code> parameter)
*/
- public CallMethodRule( int targetOffset,
- String methodName,
- int paramCount,
- Class<?> paramTypes[]) {
+ public CallMethodRule(int targetOffset, String methodName, int paramCount,
+ Class<?>[] paramTypes) {
this.targetOffset = targetOffset;
this.methodName = methodName;
this.paramCount = paramCount;
if (paramTypes == null) {
this.paramTypes = new Class[paramCount];
- for (int i = 0; i < this.paramTypes.length; i++) {
- this.paramTypes[i] = String.class;
- }
+ Arrays.fill(this.paramTypes, String.class);
} else {
this.paramTypes = new Class[paramTypes.length];
for (int i = 0; i < this.paramTypes.length; i++) {
@@ -276,10 +271,7 @@ public class CallMethodRule extends Rule {
// Push an array to capture the parameter values if necessary
if (paramCount > 0) {
- Object parameters[] = new Object[paramCount];
- for (int i = 0; i < parameters.length; i++) {
- parameters[i] = null;
- }
+ Object[] parameters = new Object[paramCount];
digester.pushParams(parameters);
}
diff --git a/java/org/apache/tomcat/util/json/JSONFilter.java
b/java/org/apache/tomcat/util/json/JSONFilter.java
index cb255dc41b..b5992d95d6 100644
--- a/java/org/apache/tomcat/util/json/JSONFilter.java
+++ b/java/org/apache/tomcat/util/json/JSONFilter.java
@@ -34,12 +34,12 @@ public class JSONFilter {
* MUST be escaped.
*/
char[] chars = input.toCharArray();
- StringBuffer escaped = null;
+ StringBuilder escaped = null;
int lastUnescapedStart = 0;
for (int i = 0; i < chars.length; i++) {
if (chars[i] < 0x20 || chars[i] == 0x22 || chars[i] == 0x5c) {
if (escaped == null) {
- escaped = new StringBuffer(chars.length + 20);
+ escaped = new StringBuilder(chars.length + 20);
}
if (lastUnescapedStart < i) {
escaped.append(input.subSequence(lastUnescapedStart, i));
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 3866475469..afc4fe4531 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -296,7 +296,7 @@ public abstract class SSLUtilBase implements SSLUtil {
char[] keyPassArray = keyPass.toCharArray();
KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
- if (kmf.getProvider().getInfo().indexOf("FIPS") != -1) {
+ if (kmf.getProvider().getInfo().contains("FIPS")) {
// FIPS doesn't like ANY wrapping nor key manipulation.
if (keyAlias != null) {
log.warn(sm.getString("sslUtilBase.aliasIgnored", keyAlias));
diff --git a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
index c92bc86f16..69c204ebfc 100644
--- a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
+++ b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
@@ -68,9 +68,9 @@ public abstract class AbstractInputStreamJar implements Jar {
// Skip base entries where there is a multi-release entry
// Skip multi-release entries that are not being used
while (entry != null &&
- (mrMap.keySet().contains(entry.getName()) ||
+ (mrMap.containsKey(entry.getName()) ||
entry.getName().startsWith("META-INF/versions/") &&
- !mrMap.values().contains(entry.getName()))) {
+ !mrMap.containsValue(entry.getName()))) {
entry = jarInputStream.getNextJarEntry();
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
