You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by "张乎兴(望陶)" <hu...@alibaba-inc.com> on 2015/10/28 04:39:42 UTC
Re: svn commit: r1710933 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ ...
+ Boolean.parseBoolean(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false"));
Codes like this can be even shorter:Boolean.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");According to the documentation:https://docs.oracle.com/javase/6/docs/api/java/lang/Boolean.htmlstatic boolean getBoolean(String name)
Returns true if and only if the system property named by the argument exists and is equal to the string "true".
Best Regards,Huxing Zhang------------------------------------------------------------------From:kkolinko <kk...@apache.org>Send Time:2015年10月28日(星期三) 11:17To:dev <de...@tomcat.apache.org>Subject:svn commit: r1710933 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/catalina/session/ java/org/apache/catalina/users/ java/org/apache/c...
Author: kkolinko
Date: Wed Oct 28 03:17:12 2015
New Revision: 1710933
URL: http://svn.apache.org/viewvc?rev=1710933&view=rev
Log:
Replace Boolean.valueOf(String).booleanValue() with Boolean.parseBoolean().
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/util/Validation.java
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Oct 28 03:17:12 2015
@@ -222,7 +222,7 @@ public final class Globals {
* compliance.
*/
public static final boolean STRICT_SERVLET_COMPLIANCE =
- Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false"));
/**
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Oct 28 03:17:12 2015
@@ -55,7 +55,7 @@ public class Connector extends Lifecycle
* Alternate flag to enable recycling of facades.
*/
public static final boolean RECYCLE_FACADES =
- Boolean.valueOf(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES", "false"));
// ------------------------------------------------------------ Constructor
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Oct 28 03:17:12 2015
@@ -79,7 +79,7 @@ public class CoyoteAdapter implements Ad
protected static final boolean ALLOW_BACKSLASH =
- Boolean.valueOf(System.getProperty("org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH", "false"));
private static final ThreadLocal<String> THREAD_NAME =
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Wed Oct 28 03:17:12 2015
@@ -81,9 +81,9 @@ public class Response
private static final boolean ENFORCE_ENCODING_IN_GET_WRITER;
static {
- ENFORCE_ENCODING_IN_GET_WRITER = Boolean.valueOf(
+ ENFORCE_ENCODING_IN_GET_WRITER = Boolean.parseBoolean(
System.getProperty("org.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER",
- "true")).booleanValue();
+ "true"));
}
public Response() {
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Oct 28 03:17:12 2015
@@ -96,8 +96,7 @@ public class ApplicationContext
if (requireSlash == null) {
GET_RESOURCE_REQUIRE_SLASH = STRICT_SERVLET_COMPLIANCE;
} else {
- GET_RESOURCE_REQUIRE_SLASH =
- Boolean.valueOf(requireSlash).booleanValue();
+ GET_RESOURCE_REQUIRE_SLASH = Boolean.parseBoolean(requireSlash);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Wed Oct 28 03:17:12 2015
@@ -76,8 +76,7 @@ final class ApplicationDispatcher implem
if (wrapSameObject == null) {
WRAP_SAME_OBJECT = STRICT_SERVLET_COMPLIANCE;
} else {
- WRAP_SAME_OBJECT =
- Boolean.valueOf(wrapSameObject).booleanValue();
+ WRAP_SAME_OBJECT = Boolean.parseBoolean(wrapSameObject);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Wed Oct 28 03:17:12 2015
@@ -69,8 +69,7 @@ final class StandardHostValve extends Va
if (accessSession == null) {
ACCESS_SESSION = STRICT_SERVLET_COMPLIANCE;
} else {
- ACCESS_SESSION =
- Boolean.valueOf(accessSession).booleanValue();
+ ACCESS_SESSION = Boolean.parseBoolean(accessSession);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Wed Oct 28 03:17:12 2015
@@ -305,7 +305,7 @@ public final class CGIServlet extends Ht
debug = Integer.parseInt(getServletConfig().getInitParameter("debug"));
cgiPathPrefix = getServletConfig().getInitParameter("cgiPathPrefix");
boolean passShellEnvironment =
- Boolean.valueOf(getServletConfig().getInitParameter("passShellEnvironment")).booleanValue();
+ Boolean.parseBoolean(getServletConfig().getInitParameter("passShellEnvironment"));
if (passShellEnvironment) {
shellEnv.putAll(System.getenv());
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Wed Oct 28 03:17:12 2015
@@ -96,8 +96,7 @@ public class StandardSession implements
if (activityCheck == null) {
ACTIVITY_CHECK = STRICT_SERVLET_COMPLIANCE;
} else {
- ACTIVITY_CHECK =
- Boolean.valueOf(activityCheck).booleanValue();
+ ACTIVITY_CHECK = Boolean.parseBoolean(activityCheck);
}
String lastAccessAtStart = System.getProperty(
@@ -105,8 +104,7 @@ public class StandardSession implements
if (lastAccessAtStart == null) {
LAST_ACCESS_AT_START = STRICT_SERVLET_COMPLIANCE;
} else {
- LAST_ACCESS_AT_START =
- Boolean.valueOf(lastAccessAtStart).booleanValue();
+ LAST_ACCESS_AT_START = Boolean.parseBoolean(lastAccessAtStart);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java Wed Oct 28 03:17:12 2015
@@ -95,7 +95,7 @@ public class MemoryUserDatabaseFactory i
ra = ref.get("readonly");
if (ra != null) {
- database.setReadonly(Boolean.valueOf(ra.getContent().toString()).booleanValue());
+ database.setReadonly(Boolean.parseBoolean(ra.getContent().toString()));
}
// Return the configured database instance
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed Oct 28 03:17:12 2015
@@ -416,7 +416,7 @@ public final class JDBCAccessLogValve ex
* is desired or not.
*/
public void setResolveHosts(String resolveHosts) {
- this.resolveHosts = Boolean.valueOf(resolveHosts).booleanValue();
+ this.resolveHosts = Boolean.parseBoolean(resolveHosts);
}
/**
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Wed Oct 28 03:17:12 2015
@@ -48,23 +48,24 @@ public class ELSupport {
protected static final boolean COERCE_TO_ZERO;
static {
+ String coerceToZeroStr;
if (IS_SECURITY_ENABLED) {
- COERCE_TO_ZERO = AccessController.doPrivileged(
- new PrivilegedAction<Boolean>(){
+ coerceToZeroStr = AccessController.doPrivileged(
+ new PrivilegedAction<String>(){
@Override
- public Boolean run() {
- return Boolean.valueOf(System.getProperty(
+ public String run() {
+ return System.getProperty(
"org.apache.el.parser.COERCE_TO_ZERO",
- "false"));
+ "false");
}
}
- ).booleanValue();
+ );
} else {
- COERCE_TO_ZERO = Boolean.valueOf(System.getProperty(
- "org.apache.el.parser.COERCE_TO_ZERO",
- "false")).booleanValue();
+ coerceToZeroStr = System.getProperty(
+ "org.apache.el.parser.COERCE_TO_ZERO", "false");
}
+ COERCE_TO_ZERO = Boolean.parseBoolean(coerceToZeroStr);
}
Modified: tomcat/trunk/java/org/apache/el/util/Validation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/Validation.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/Validation.java (original)
+++ tomcat/trunk/java/org/apache/el/util/Validation.java Wed Oct 28 03:17:12 2015
@@ -39,22 +39,23 @@ public class Validation {
private static final boolean SKIP_IDENTIFIER_CHECK;
static {
+ String skipIdentifierCheckStr;
if (IS_SECURITY_ENABLED) {
- SKIP_IDENTIFIER_CHECK = AccessController.doPrivileged(
- new PrivilegedAction<Boolean>(){
+ skipIdentifierCheckStr = AccessController.doPrivileged(
+ new PrivilegedAction<String>(){
@Override
- public Boolean run() {
- return Boolean.valueOf(System.getProperty(
+ public String run() {
+ return System.getProperty(
"org.apache.el.parser.SKIP_IDENTIFIER_CHECK",
- "false"));
+ "false");
}
}
- ).booleanValue();
+ );
} else {
- SKIP_IDENTIFIER_CHECK = Boolean.valueOf(System.getProperty(
- "org.apache.el.parser.SKIP_IDENTIFIER_CHECK",
- "false")).booleanValue();
+ skipIdentifierCheckStr = System.getProperty(
+ "org.apache.el.parser.SKIP_IDENTIFIER_CHECK", "false");
}
+ SKIP_IDENTIFIER_CHECK = Boolean.parseBoolean(skipIdentifierCheckStr);
}
Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Wed Oct 28 03:17:12 2015
@@ -120,7 +120,7 @@ public class Constants {
(System.getSecurityManager() != null);
public static final boolean USE_INSTANCE_MANAGER_FOR_TAGS =
- Boolean.valueOf(System.getProperty("org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS", "false"));
/**
* The name of the path parameter used to pass the session identifier
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Wed Oct 28 03:17:12 2015
@@ -29,10 +29,10 @@ package org.apache.jasper.compiler;
public class AttributeParser {
/* System property that controls if the strict quoting rules are applied. */
- private static final boolean STRICT_QUOTE_ESCAPING = Boolean.valueOf(
+ private static final boolean STRICT_QUOTE_ESCAPING = Boolean.parseBoolean(
System.getProperty(
"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
- "true")).booleanValue();
+ "true"));
/**
* Parses the provided input String as a JSP attribute and returns an
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Oct 28 03:17:12 2015
@@ -91,10 +91,10 @@ class Generator {
* used in jsp:getProperty action to be previously "introduced"
* to the JSP processor (see JSP.5.3) is enforced.
*/
- private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
+ private static final boolean STRICT_GET_PROPERTY = Boolean.parseBoolean(
System.getProperty(
"org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
- "true")).booleanValue();
+ "true"));
private final ServletWriter out;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Wed Oct 28 03:17:12 2015
@@ -248,7 +248,7 @@ public class JspUtil {
/**
* Convert a String value to 'boolean'. Besides the standard conversions
- * done by Boolean.valueOf(s).booleanValue(), the value "yes" (ignore case)
+ * done by Boolean.parseBoolean(s), the value "yes" (ignore case)
* is also converted to 'true'. If 's' is null, then 'false' is returned.
*
* @param s
@@ -261,7 +261,7 @@ public class JspUtil {
if (s.equalsIgnoreCase("yes")) {
b = true;
} else {
- b = Boolean.valueOf(s).booleanValue();
+ b = Boolean.parseBoolean(s);
}
}
return b;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Wed Oct 28 03:17:12 2015
@@ -80,10 +80,10 @@ class Parser implements TagConstants {
/* System property that controls if the strict white space rules are
* applied.
*/
- private static final boolean STRICT_WHITESPACE = Boolean.valueOf(
+ private static final boolean STRICT_WHITESPACE = Boolean.parseBoolean(
System.getProperty(
"org.apache.jasper.compiler.Parser.STRICT_WHITESPACE",
- "true")).booleanValue();
+ "true"));
/**
* The constructor
*/
Modified: tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java Wed Oct 28 03:17:12 2015
@@ -40,7 +40,7 @@ import org.apache.jasper.Constants;
public class BodyContentImpl extends BodyContent {
private static final boolean LIMIT_BUFFER =
- Boolean.valueOf(System.getProperty("org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "false"));
private char[] cb;
private int nextChar;
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=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Wed Oct 28 03:17:12 2015
@@ -40,7 +40,7 @@ public class JspFactoryImpl extends JspF
private static final String SPEC_VERSION = "2.3";
private static final boolean USE_POOL =
- Boolean.valueOf(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.USE_POOL", "true")).booleanValue();
+ 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();
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=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Wed Oct 28 03:17:12 2015
@@ -494,7 +494,7 @@ public class JspRuntimeLibrary {
} else if (t.equals(boolean.class)) {
boolean[] tmpval = new boolean[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = (Boolean.valueOf(values[i])).booleanValue();
+ tmpval[i] = Boolean.parseBoolean(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(short.class)) {
short[] tmpval = new short[values.length];
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Wed Oct 28 03:17:12 2015
@@ -206,7 +206,7 @@ public class ClassLoaderLogManager exten
// Unlike java.util.logging, the default is to not delegate if a list of handlers
// has been specified for the logger.
String useParentHandlersString = getProperty(loggerName + ".useParentHandlers");
- if (Boolean.valueOf(useParentHandlersString).booleanValue()) {
+ if (Boolean.parseBoolean(useParentHandlersString)) {
logger.setUseParentHandlers(true);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Wed Oct 28 03:17:12 2015
@@ -41,7 +41,7 @@ public final class UDecoder {
private static final Log log = LogFactory.getLog(UDecoder.class);
public static final boolean ALLOW_ENCODED_SLASH =
- Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false"));
private static class DecodeException extends CharConversionException {
private static final long serialVersionUID = 1L;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Wed Oct 28 03:17:12 2015
@@ -44,7 +44,7 @@ public class NioSelectorPool {
private static final Log log = LogFactory.getLog(NioSelectorPool.class);
protected static final boolean SHARED =
- Boolean.valueOf(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared", "true")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared", "true"));
protected NioBlockingSelector blockingSelector;
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1710933&r1=1710932&r2=1710933&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Wed Oct 28 03:17:12 2015
@@ -318,17 +318,17 @@ public class DataSourceFactory implement
value = properties.getProperty(PROP_TESTONBORROW);
if (value != null) {
- poolProperties.setTestOnBorrow(Boolean.valueOf(value).booleanValue());
+ poolProperties.setTestOnBorrow(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TESTONRETURN);
if (value != null) {
- poolProperties.setTestOnReturn(Boolean.valueOf(value).booleanValue());
+ poolProperties.setTestOnReturn(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TESTONCONNECT);
if (value != null) {
- poolProperties.setTestOnConnect(Boolean.valueOf(value).booleanValue());
+ poolProperties.setTestOnConnect(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TIMEBETWEENEVICTIONRUNSMILLIS);
@@ -348,7 +348,7 @@ public class DataSourceFactory implement
value = properties.getProperty(PROP_TESTWHILEIDLE);
if (value != null) {
- poolProperties.setTestWhileIdle(Boolean.valueOf(value).booleanValue());
+ poolProperties.setTestWhileIdle(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_PASSWORD);
@@ -388,12 +388,12 @@ public class DataSourceFactory implement
value = properties.getProperty(PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED);
if (value != null) {
- poolProperties.setAccessToUnderlyingConnectionAllowed(Boolean.valueOf(value).booleanValue());
+ poolProperties.setAccessToUnderlyingConnectionAllowed(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_REMOVEABANDONED);
if (value != null) {
- poolProperties.setRemoveAbandoned(Boolean.valueOf(value).booleanValue());
+ poolProperties.setRemoveAbandoned(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_REMOVEABANDONEDTIMEOUT);
@@ -403,7 +403,7 @@ public class DataSourceFactory implement
value = properties.getProperty(PROP_LOGABANDONED);
if (value != null) {
- poolProperties.setLogAbandoned(Boolean.valueOf(value).booleanValue());
+ poolProperties.setLogAbandoned(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_POOLPREPAREDSTATEMENTS);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org