Author: violetagg
Date: Mon Nov 2 13:17:14 2015
New Revision: 1711958
URL: http://svn.apache.org/viewvc?rev=1711958&view=rev
Log:
Merged revision 1710933 from tomcat/trunk:
Replace Boolean.valueOf(String).booleanValue() with Boolean.parseBoolean().
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/el/util/Validation.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 13:17:14 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,170
3160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1711006,1711016,1711022,1711026
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,170
3160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1711006,1711016,1711022,1711026
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java Mon Nov 2
13:17:14 2015
@@ -259,7 +259,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/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java Mon
Nov 2 13:17:14 2015
@@ -53,7 +53,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/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Mon Nov 2 13:17:14 2015
@@ -81,7 +81,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/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java Mon
Nov 2 13:17:14 2015
@@ -84,9 +84,9 @@ public class Response
// Ensure that URL is loaded for SM
URL.isSchemeChar('c');
- 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/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Mon Nov 2 13:17:14 2015
@@ -97,8 +97,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/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Mon Nov 2 13:17:14 2015
@@ -70,8 +70,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/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon
Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java Mon Nov 2
13:17:14 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/tc8.0.x/trunk/java/org/apache/el/util/Validation.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/util/Validation.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/util/Validation.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/util/Validation.java Mon Nov 2
13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java Mon Nov 2
13:17:14 2015
@@ -133,7 +133,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/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon Nov
2 13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Mon Nov
2 13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Mon Nov 2
13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Mon
Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Mon
Nov 2 13:17:14 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/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Mon Nov
2 13:17:14 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/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Mon Nov 2 13:17:14 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/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1711958&r1=1711957&r2=1711958&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Mon Nov 2 13:17:14 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
