Author: violetagg
Date: Tue Oct 27 09:58:26 2015
New Revision: 1710755
URL: http://svn.apache.org/viewvc?rev=1710755&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58547
Merged revision 1710753 from tomcat/trunk:
Use static valueOf instead of inefficient Number constructor. Based on a patch
provided by Anthony Whitford.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 09:58:26 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,1709266,1709663,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689
+/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,1709266,1709663,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
Tue Oct 27 09:58:26 2015
@@ -501,7 +501,7 @@ public class JMXAccessorTask extends Bas
Object convertValue = value;
if ("java.lang.Integer".equals(valueType) || "int".equals(valueType)) {
try {
- convertValue = new Integer(value);
+ convertValue = Integer.valueOf(value);
} catch (NumberFormatException ex) {
if (isEcho())
handleErrorOutput("Unable to convert to integer:" + value);
@@ -509,7 +509,7 @@ public class JMXAccessorTask extends Bas
} else if ("java.lang.Long".equals(valueType)
|| "long".equals(valueType)) {
try {
- convertValue = new Long(value);
+ convertValue = Long.valueOf(value);
} catch (NumberFormatException ex) {
if (isEcho())
handleErrorOutput("Unable to convert to long:" + value);
@@ -520,7 +520,7 @@ public class JMXAccessorTask extends Bas
} else if ("java.lang.Float".equals(valueType)
|| "float".equals(valueType)) {
try {
- convertValue = new Float(value);
+ convertValue = Float.valueOf(value);
} catch (NumberFormatException ex) {
if (isEcho())
handleErrorOutput("Unable to convert to float:" + value);
@@ -528,7 +528,7 @@ public class JMXAccessorTask extends Bas
} else if ("java.lang.Double".equals(valueType)
|| "double".equals(valueType)) {
try {
- convertValue = new Double(value);
+ convertValue = Double.valueOf(value);
} catch (NumberFormatException ex) {
if (isEcho())
handleErrorOutput("Unable to convert to double:" + value);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Oct 27 09:58:26 2015
@@ -3257,7 +3257,7 @@ public class Request
for (AcceptLanguage acceptLanguage : acceptLanguages) {
// Add a new Locale to the list of Locales for this quality level
- Double key = new Double(-acceptLanguage.getQuality()); // Reverse
the order
+ Double key = Double.valueOf(-acceptLanguage.getQuality()); //
Reverse the order
ArrayList<Locale> values = locales.get(key);
if (values == null) {
values = new ArrayList<>();
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=1710755&r1=1710754&r2=1710755&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
Tue Oct 27 09:58:26 2015
@@ -365,7 +365,7 @@ final class StandardHostValve extends Va
request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
DispatcherType.ERROR);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
- new
Integer(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+
Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
request.setAttribute(RequestDispatcher.ERROR_MESSAGE,
throwable.getMessage());
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Oct 27 09:58:26 2015
@@ -882,14 +882,14 @@ public class WebdavServlet
}
if (lockDurationStr.startsWith("Second-")) {
lockDuration =
- (new Integer(lockDurationStr.substring(7))).intValue();
+ (Integer.valueOf(lockDurationStr.substring(7))).intValue();
} else {
if (lockDurationStr.equalsIgnoreCase("infinity")) {
lockDuration = MAX_TIMEOUT;
} else {
try {
lockDuration =
- (new Integer(lockDurationStr)).intValue();
+ (Integer.valueOf(lockDurationStr)).intValue();
} catch (NumberFormatException e) {
lockDuration = MAX_TIMEOUT;
}
@@ -1640,7 +1640,7 @@ public class WebdavServlet
if (!resources.mkdir(dest)) {
WebResource destResource = resources.getResource(dest);
if (!destResource.isDirectory()) {
- errorList.put(dest, new Integer(WebdavStatus.SC_CONFLICT));
+ errorList.put(dest,
Integer.valueOf(WebdavStatus.SC_CONFLICT));
return false;
}
}
@@ -1667,7 +1667,7 @@ public class WebdavServlet
String parent = destResource.getWebappPath().substring(0,
lastSlash);
WebResource parentResource = resources.getResource(parent);
if (!parentResource.isDirectory()) {
- errorList.put(source, new
Integer(WebdavStatus.SC_CONFLICT));
+ errorList.put(source,
Integer.valueOf(WebdavStatus.SC_CONFLICT));
return false;
}
}
@@ -1675,12 +1675,12 @@ public class WebdavServlet
if (!resources.write(dest, sourceResource.getInputStream(),
false)) {
errorList.put(source,
- new Integer(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
} else {
errorList.put(source,
- new Integer(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+ Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
return true;
@@ -1749,7 +1749,7 @@ public class WebdavServlet
deleteCollection(req, path, errorList);
if (!resource.delete()) {
- errorList.put(path, new Integer
+ errorList.put(path, Integer.valueOf
(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
}
@@ -1780,7 +1780,7 @@ public class WebdavServlet
// Prevent deletion of special subdirectories
if (isSpecialPath(path)) {
- errorList.put(path, new Integer(WebdavStatus.SC_FORBIDDEN));
+ errorList.put(path, Integer.valueOf(WebdavStatus.SC_FORBIDDEN));
return;
}
@@ -1802,7 +1802,7 @@ public class WebdavServlet
if (isLocked(childName, ifHeader + lockTokenHeader)) {
- errorList.put(childName, new Integer(WebdavStatus.SC_LOCKED));
+ errorList.put(childName,
Integer.valueOf(WebdavStatus.SC_LOCKED));
} else {
WebResource childResource = resources.getResource(childName);
@@ -1814,7 +1814,7 @@ public class WebdavServlet
if (!childResource.isDirectory()) {
// If it's not a collection, then it's an unknown
// error
- errorList.put(childName, new Integer(
+ errorList.put(childName, Integer.valueOf(
WebdavStatus.SC_INTERNAL_SERVER_ERROR));
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
Tue Oct 27 09:58:26 2015
@@ -391,7 +391,7 @@ public class StandardManager extends Man
log.debug("Unloading " + sessions.size() + " sessions");
try {
// oos can't be null here
- oos.writeObject(new Integer(sessions.size()));
+ oos.writeObject(Integer.valueOf(sessions.size()));
Iterator<Session> elements = sessions.values().iterator();
while (elements.hasNext()) {
StandardSession session =
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Tue Oct 27 09:58:26 2015
@@ -195,7 +195,7 @@ public class McastService implements Mem
public int getRecoveryCounter(){
String p = properties.getProperty("recoveryCounter");
if(p != null){
- return new Integer(p).intValue();
+ return Integer.valueOf(p).intValue();
}
return -1;
}
@@ -219,7 +219,7 @@ public class McastService implements Mem
public long getRecoverySleepTime(){
String p = properties.getProperty("recoverySleepTime");
if(p != null){
- return new Long(p).longValue();
+ return Long.valueOf(p).longValue();
}
return -1;
}
@@ -238,7 +238,7 @@ public class McastService implements Mem
public int getPort() {
String p = properties.getProperty("mcastPort");
- return new Integer(p).intValue();
+ return Integer.valueOf(p).intValue();
}
public void setFrequency(long time) {
@@ -247,7 +247,7 @@ public class McastService implements Mem
public long getFrequency() {
String p = properties.getProperty("mcastFrequency");
- return new Long(p).longValue();
+ return Long.valueOf(p).longValue();
}
public void setMcastDropTime(long time) {
@@ -259,7 +259,7 @@ public class McastService implements Mem
public long getDropTime() {
String p = properties.getProperty("memberDropTime");
- return new Long(p).longValue();
+ return Long.valueOf(p).longValue();
}
/**
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Oct 27 09:58:26 2015
@@ -300,7 +300,7 @@ public abstract class AbstractReplicated
protected void memberAlive(Member member) {
mapMemberAdded(member);
synchronized (mapMembers) {
- mapMembers.put(member, new Long(System.currentTimeMillis()));
+ mapMembers.put(member, Long.valueOf(System.currentTimeMillis()));
}
}
@@ -736,7 +736,7 @@ public abstract class AbstractReplicated
//select a backup node if we don't have one
synchronized (mapMembers) {
if (!mapMembers.containsKey(member) ) {
- mapMembers.put(member, new Long(System.currentTimeMillis()));
+ mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Tue Oct 27 09:58:26 2015
@@ -237,7 +237,7 @@ public class ReplicatedMap<K,V> extends
boolean memberAdded = false;
synchronized (mapMembers) {
if (!mapMembers.containsKey(member) ) {
- mapMembers.put(member, new Long(System.currentTimeMillis()));
+ mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Tue Oct 27 09:58:26 2015
@@ -91,7 +91,7 @@ public class BioSender extends AbstractS
closeSocket();
if (connect) {
if (log.isDebugEnabled())
- log.debug(sm.getString("bioSender.disconnect",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
+ log.debug(sm.getString("bioSender.disconnect",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
}
}
@@ -108,7 +108,7 @@ public class BioSender extends AbstractS
} catch (IOException x) {
SenderState.getSenderState(getDestination()).setSuspect();
exception = x;
- if (log.isTraceEnabled())
log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),new Integer(getPort())),x);
+ if (log.isTraceEnabled())
log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),Integer.valueOf(getPort())),x);
while ( getAttempt()<getMaxRetryAttempts() ) {
try {
setAttempt(getAttempt()+1);
@@ -166,11 +166,11 @@ public class BioSender extends AbstractS
setRequestCount(0);
setConnectTime(System.currentTimeMillis());
if (log.isDebugEnabled())
- log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
+ log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
} catch (IOException ex1) {
SenderState.getSenderState(getDestination()).setSuspect();
if (log.isDebugEnabled())
-
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)), ex1);
+
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)), ex1);
throw (ex1);
}
@@ -197,7 +197,7 @@ public class BioSender extends AbstractS
setRequestCount(0);
setConnected(false);
if (log.isDebugEnabled())
-
log.debug(sm.getString("bioSender.closeSocket",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)));
+
log.debug(sm.getString("bioSender.closeSocket",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)));
}
}
@@ -257,13 +257,13 @@ public class BioSender extends AbstractS
i = soIn.read();
}
if (!ackReceived) {
- if (i == -1) throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(), new
Integer(socket.getLocalPort())));
- else throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(), new
Integer(socket.getLocalPort())));
+ if (i == -1) throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ else throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(),
Integer.valueOf(socket.getLocalPort())));
} else if ( failAckReceived && getThrowOnFailedAck()) {
throw new
RemoteProcessException(sm.getString("bioSender.fail.AckReceived"));
}
} catch (IOException x) {
- String errmsg = sm.getString("bioSender.ack.missing",
getAddress(),new Integer(socket.getLocalPort()), new Long(getTimeout()));
+ String errmsg = sm.getString("bioSender.ack.missing",
getAddress(), Integer.valueOf(socket.getLocalPort()),
Long.valueOf(getTimeout()));
if ( SenderState.getSenderState(getDestination()).isReady() ) {
SenderState.getSenderState(getDestination()).setSuspect();
if ( log.isWarnEnabled() ) log.warn(errmsg, x);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Oct 27
09:58:26 2015
@@ -63,7 +63,7 @@ public abstract class ELArithmetic {
@Override
protected Number mod(Number num0, Number num1) {
- return new Double(num0.doubleValue() % num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() % num1.doubleValue());
}
@Override
@@ -132,7 +132,7 @@ public abstract class ELArithmetic {
} else if (num1 instanceof BigDecimal) {
return ((new BigDecimal(num0.doubleValue()).add((BigDecimal)
num1)));
}
- return new Double(num0.doubleValue() + num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() + num1.doubleValue());
}
@Override
@@ -141,22 +141,22 @@ public abstract class ELArithmetic {
return num;
if (num instanceof BigInteger)
return new BigDecimal((BigInteger) num);
- return new Double(num.doubleValue());
+ return Double.valueOf(num.doubleValue());
}
@Override
protected Number coerce(String str) {
- return new Double(str);
+ return Double.valueOf(str);
}
@Override
protected Number divide(Number num0, Number num1) {
- return new Double(num0.doubleValue() / num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() / num1.doubleValue());
}
@Override
protected Number mod(Number num0, Number num1) {
- return new Double(num0.doubleValue() % num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() % num1.doubleValue());
}
@Override
@@ -167,7 +167,7 @@ public abstract class ELArithmetic {
} else if (num1 instanceof BigDecimal) {
return ((new
BigDecimal(num0.doubleValue()).subtract((BigDecimal) num1)));
}
- return new Double(num0.doubleValue() - num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() - num1.doubleValue());
}
@Override
@@ -178,7 +178,7 @@ public abstract class ELArithmetic {
} else if (num1 instanceof BigDecimal) {
return ((new
BigDecimal(num0.doubleValue()).multiply((BigDecimal) num1)));
}
- return new Double(num0.doubleValue() * num1.doubleValue());
+ return Double.valueOf(num0.doubleValue() * num1.doubleValue());
}
@Override
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=1710755&r1=1710754&r2=1710755&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 Tue Oct 27
09:58:26 2015
@@ -315,7 +315,7 @@ public class ELSupport {
return Long.valueOf(number.longValue());
}
if (Double.TYPE == type || Double.class.equals(type)) {
- return new Double(number.doubleValue());
+ return Double.valueOf(number.doubleValue());
}
if (Integer.TYPE == type || Integer.class.equals(type)) {
return Integer.valueOf(number.intValue());
@@ -345,7 +345,7 @@ public class ELSupport {
return Short.valueOf(number.shortValue());
}
if (Float.TYPE == type || Float.class.equals(type)) {
- return new Float(number.floatValue());
+ return Float.valueOf(number.floatValue());
}
if (Number.class.equals(type)) {
return number;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Node.java Tue Oct 27
09:58:26 2015
@@ -2079,7 +2079,7 @@ abstract class Node implements TagConsta
if (extraSmap == null) {
extraSmap = new ArrayList<>();
}
- extraSmap.add(new Integer(srcLine));
+ extraSmap.add(Integer.valueOf(srcLine));
}
public ArrayList<Integer> getExtraSmap() {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java Tue Oct
27 09:58:26 2015
@@ -455,7 +455,7 @@ class PageInfo {
}
try {
@SuppressWarnings("null") // value can't be null here
- Integer k = new Integer(value.substring(0, value.length()-2));
+ Integer k = Integer.valueOf(value.substring(0,
value.length()-2));
buffer = k.intValue() * 1024;
} catch (NumberFormatException e) {
if (n == null) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
Tue Oct 27 09:58:26 2015
@@ -35,7 +35,7 @@ import org.apache.jasper.JasperException
*/
class ScriptingVariabler {
- private static final Integer MAX_SCOPE = new Integer(Integer.MAX_VALUE);
+ private static final Integer MAX_SCOPE =
Integer.valueOf(Integer.MAX_VALUE);
/*
* Assigns an identifier (of type integer) to every custom tag, in order
@@ -54,7 +54,7 @@ class ScriptingVariabler {
parent = n;
visitBody(n);
parent = tmpParent;
- n.setNumCount(new Integer(count++));
+ n.setNumCount(Integer.valueOf(count++));
}
}
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=1710755&r1=1710754&r2=1710755&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
Tue Oct 27 09:58:26 2015
@@ -444,12 +444,12 @@ public class JspRuntimeLibrary {
} else if (t.equals(Integer.class)) {
Integer []tmpval = new Integer[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = new Integer (values[i]);
+ tmpval[i] = Integer.valueOf(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Byte.class)) {
Byte[] tmpval = new Byte[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = new Byte (values[i]);
+ tmpval[i] = Byte.valueOf(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Boolean.class)) {
Boolean[] tmpval = new Boolean[values.length];
@@ -459,22 +459,22 @@ public class JspRuntimeLibrary {
} else if (t.equals(Short.class)) {
Short[] tmpval = new Short[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = new Short (values[i]);
+ tmpval[i] = Short.valueOf(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Long.class)) {
Long[] tmpval = new Long[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = new Long (values[i]);
+ tmpval[i] = Long.valueOf(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Double.class)) {
Double[] tmpval = new Double[values.length];
for (int i = 0 ; i < values.length; i++)
- tmpval[i] = new Double (values[i]);
+ tmpval[i] = Double.valueOf(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] = new Float (values[i]);
+ tmpval[i] = Float.valueOf(values[i]);
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Character.class)) {
Character[] tmpval = new Character[values.length];
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Tue Oct 27 09:58:26 2015
@@ -857,7 +857,7 @@ public class PageContextImpl extends Pag
*/
request.setAttribute(PageContext.EXCEPTION, t);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
- new Integer(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+
Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
((HttpServletRequest) request).getRequestURI());
request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
Modified: tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java Tue
Oct 27 09:58:26 2015
@@ -234,22 +234,22 @@ public class BeanFactory
Character.valueOf(value.charAt(0));
} else if (propType.equals(Byte.class)
|| propType.equals(byte.class)) {
- valueArray[0] = new Byte(value);
+ valueArray[0] = Byte.valueOf(value);
} else if (propType.equals(Short.class)
|| propType.equals(short.class)) {
- valueArray[0] = new Short(value);
+ valueArray[0] = Short.valueOf(value);
} else if (propType.equals(Integer.class)
|| propType.equals(int.class)) {
- valueArray[0] = new Integer(value);
+ valueArray[0] = Integer.valueOf(value);
} else if (propType.equals(Long.class)
|| propType.equals(long.class)) {
- valueArray[0] = new Long(value);
+ valueArray[0] = Long.valueOf(value);
} else if (propType.equals(Float.class)
|| propType.equals(float.class)) {
- valueArray[0] = new Float(value);
+ valueArray[0] = Float.valueOf(value);
} else if (propType.equals(Double.class)
|| propType.equals(double.class)) {
- valueArray[0] = new Double(value);
+ valueArray[0] = Double.valueOf(value);
} else if (propType.equals(Boolean.class)
|| propType.equals(boolean.class)) {
valueArray[0] = Boolean.valueOf(value);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
Tue Oct 27 09:58:26 2015
@@ -80,7 +80,7 @@ public final class IntrospectionUtils {
if ("java.lang.Integer".equals(paramType.getName())
|| "int".equals(paramType.getName())) {
try {
- params[0] = new Integer(value);
+ params[0] = Integer.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
@@ -88,7 +88,7 @@ public final class IntrospectionUtils {
}else if ("java.lang.Long".equals(paramType.getName())
|| "long".equals(paramType.getName())) {
try {
- params[0] = new Long(value);
+ params[0] = Long.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
@@ -405,7 +405,7 @@ public final class IntrospectionUtils {
} else if ("java.lang.Integer".equals(paramType.getName())
|| "int".equals(paramType.getName())) {
try {
- result = new Integer(object);
+ result = Integer.valueOf(object);
} catch (NumberFormatException ex) {
}
// Try a setFoo ( boolean )
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Tue Oct 27 09:58:26 2015
@@ -130,7 +130,7 @@ public final class FastHttpDateFormat {
public static final String formatDate
(long value, DateFormat threadLocalformat) {
- Long longValue = new Long(value);
+ Long longValue = Long.valueOf(value);
String cachedDate = formatCache.get(longValue);
if (cachedDate != null) {
return cachedDate;
@@ -194,7 +194,7 @@ public final class FastHttpDateFormat {
if (date == null) {
return null;
}
- return new Long(date.getTime());
+ return Long.valueOf(date.getTime());
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Tue
Oct 27 09:58:26 2015
@@ -317,7 +317,7 @@ public class Registry implements Registr
ids.put( domain, id);
}
int code=id[0]++;
- domainTable.put( name, new Integer( code ));
+ domainTable.put( name, Integer.valueOf( code ));
return code;
}
@@ -520,10 +520,10 @@ public class Registry implements Registr
}
} else if( "java.lang.Integer".equals( type ) ||
"int".equals( type )) {
- objValue=new Integer( value );
+ objValue=Integer.valueOf( value );
} else if( "java.lang.Long".equals( type ) ||
"long".equals( type )) {
- objValue=new Long( value );
+ objValue=Long.valueOf( value );
} else if( "java.lang.Boolean".equals( type ) ||
"boolean".equals( type )) {
objValue=Boolean.valueOf( value );
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue
Oct 27 09:58:26 2015
@@ -2219,7 +2219,7 @@ public class AprEndpoint extends Abstrac
if (rv == Status.APR_SUCCESS) {
sendfileCount--;
}
- sendfileData.remove(new Long(data.socket));
+ sendfileData.remove(Long.valueOf(data.socket));
}
/**
@@ -2267,7 +2267,7 @@ public class AprEndpoint extends Abstrac
SendfileData data = addS.get(i);
int rv = Poll.add(sendfilePollset,
data.socket, Poll.APR_POLLOUT);
if (rv == Status.APR_SUCCESS) {
- sendfileData.put(new Long(data.socket),
data);
+
sendfileData.put(Long.valueOf(data.socket), data);
sendfileCount++;
} else {
getLog().warn(sm.getString(
@@ -2289,7 +2289,7 @@ public class AprEndpoint extends Abstrac
for (int n = 0; n < rv; n++) {
// Get the sendfile state
SendfileData state =
- sendfileData.get(new Long(desc[n*2+1]));
+ sendfileData.get(Long.valueOf(desc[n*2+1]));
// Problem events
if (((desc[n*2] & Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
|| ((desc[n*2] & Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
@@ -2360,7 +2360,7 @@ public class AprEndpoint extends Abstrac
if (rv > 0) {
for (int n = 0; n < rv; n++) {
// Get the sendfile state
- SendfileData state = sendfileData.get(new
Long(desc[n]));
+ SendfileData state =
sendfileData.get(Long.valueOf(desc[n]));
// Close socket and clear pool
remove(state);
// Destroy file descriptor pool, which should
close the file
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
Tue Oct 27 09:58:26 2015
@@ -144,7 +144,7 @@ public class SocketProperties {
/**
* SO_TIMEOUT option. default is 20000.
*/
- protected Integer soTimeout = new Integer(20000);
+ protected Integer soTimeout = Integer.valueOf(20000);
/**
* Performance preferences according to
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Tue Oct 27 09:58:26 2015
@@ -541,7 +541,7 @@ public class AsyncChannelWrapperSecure i
throw new ExecutionException(sm.getString(
"asyncChannelWrapperSecure.tooBig", result), null);
}
- return new Integer(result.intValue());
+ return Integer.valueOf(result.intValue());
}
@Override
@@ -553,7 +553,7 @@ public class AsyncChannelWrapperSecure i
throw new ExecutionException(sm.getString(
"asyncChannelWrapperSecure.tooBig", result), null);
}
- return new Integer(result.intValue());
+ return Integer.valueOf(result.intValue());
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1710755&r1=1710754&r2=1710755&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Oct 27 09:58:26 2015
@@ -96,6 +96,11 @@
Anthony Whitford. (violetagg)
</fix>
<fix>
+ <bug>58541</bug>, <bug>58547</bug>: It is more efficient to call
+ <code>valueOf(...)</code> instead of Number constructor. Based on a
+ patch provided by Anthony Whitford. (violetagg)
+ </fix>
+ <fix>
<bug>58545</bug>: In some use cases it is more efficient to use
<code>Map.entrySet()</code> instead of <code>Map.keySet()</code>
Based on a patch provided by Anthony Whitford. (violetagg)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
