Author: kkolinko
Date: Wed Oct 28 05:36:20 2015
New Revision: 1710945
URL: http://svn.apache.org/viewvc?rev=1710945&view=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547
Replace Integer.valueOf(String).intValue() with simple parseInt(), and similar
methods.
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Wed Oct 28 05:36:20 2015
@@ -40,20 +40,20 @@ public class BeanELResolver extends ELRe
"org.apache.el.BeanELResolver.CACHE_SIZE";
static {
+ String cacheSizeStr;
if (System.getSecurityManager() == null) {
- CACHE_SIZE = Integer.parseInt(
- System.getProperty(CACHE_SIZE_PROP, "1000"));
+ cacheSizeStr = System.getProperty(CACHE_SIZE_PROP, "1000");
} else {
- CACHE_SIZE = AccessController.doPrivileged(
- new PrivilegedAction<Integer>() {
+ cacheSizeStr = AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
@Override
- public Integer run() {
- return Integer.valueOf(
- System.getProperty(CACHE_SIZE_PROP, "1000"));
+ public String run() {
+ return System.getProperty(CACHE_SIZE_PROP, "1000");
}
- }).intValue();
+ });
}
+ CACHE_SIZE = Integer.parseInt(cacheSizeStr);
}
private final boolean readOnly;
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Wed Oct 28
05:36:20 2015
@@ -55,20 +55,20 @@ public final class ExpressionBuilder imp
"org.apache.el.ExpressionBuilder.CACHE_SIZE";
static {
+ String cacheSizeStr;
if (System.getSecurityManager() == null) {
- CACHE_SIZE = Integer.parseInt(
- System.getProperty(CACHE_SIZE_PROP, "5000"));
+ cacheSizeStr = System.getProperty(CACHE_SIZE_PROP, "5000");
} else {
- CACHE_SIZE = AccessController.doPrivileged(
- new PrivilegedAction<Integer>() {
+ cacheSizeStr = AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
@Override
- public Integer run() {
- return Integer.valueOf(
- System.getProperty(CACHE_SIZE_PROP, "5000"));
+ public String run() {
+ return System.getProperty(CACHE_SIZE_PROP, "5000");
}
- }).intValue();
+ });
}
+ CACHE_SIZE = Integer.parseInt(cacheSizeStr);
}
private static final ConcurrentCache<String, Node> expressionCache =
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Wed Oct 28
05:36:20 2015
@@ -42,7 +42,7 @@ public class JspFactoryImpl extends JspF
private static final boolean USE_POOL =
Boolean.parseBoolean(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.USE_POOL",
"true"));
private static final int POOL_SIZE =
-
Integer.valueOf(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.POOL_SIZE",
"8")).intValue();
+
Integer.parseInt(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.POOL_SIZE",
"8"));
private final ThreadLocal<PageContextPool> localPool = new ThreadLocal<>();
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Wed Oct
28 05:36:20 2015
@@ -509,12 +509,12 @@ public class JspRuntimeLibrary {
} else if (t.equals(double.class)) {
double[] tmpval = new double[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = Double.valueOf(values[i]).doubleValue();
+ tmpval[i] = Double.parseDouble(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(float.class)) {
float[] tmpval = new float[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = Float.valueOf(values[i]).floatValue();
+ tmpval[i] = Float.parseFloat(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(char.class)) {
char[] tmpval = new char[values.length];
Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Wed
Oct 28 05:36:20 2015
@@ -121,7 +121,7 @@ public class TestAbstractAjpProcessor ex
ajpClient.setServerName(value);
break;
case "REQUEST-SERVER-PORT":
- ajpClient.setServerPort(Integer.valueOf(value).intValue());
+ ajpClient.setServerPort(Integer.parseInt(value));
break;
case "REQUEST-IS-SECURE":
ajpClient.setSsl(Boolean.parseBoolean(value));
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java?rev=1710945&r1=1710944&r2=1710945&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Wed Oct 28 05:36:20 2015
@@ -133,7 +133,7 @@ public class TesterWsClientAutobahn {
@OnMessage
public void onMessage(String msg) {
latch.countDown();
- caseCount = Integer.valueOf(msg).intValue();
+ caseCount = Integer.parseInt(msg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
