Author: markt
Date: Mon Oct 2 18:39:22 2017
New Revision: 1810572
URL: http://svn.apache.org/viewvc?rev=1810572&view=rev
Log:
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/Diagnostics.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/tc8.5.x/trunk/test/javax/el/TestArrayELResolver.java
tomcat/tc8.5.x/trunk/test/javax/el/TestBeanELResolver.java
tomcat/tc8.5.x/trunk/test/javax/el/TestListELResolver.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag
tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug57142.jsp
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 2 18:39:22 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,17
96275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901
,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636
,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/lang/ELArithmetic.java Mon Oct 2
18:39:22 2017
@@ -19,6 +19,7 @@ package org.apache.el.lang;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.RoundingMode;
import org.apache.el.util.MessageFactory;
@@ -53,7 +54,7 @@ public abstract class ELArithmetic {
@Override
protected Number divide(Number num0, Number num1) {
return ((BigDecimal) num0).divide((BigDecimal) num1,
- BigDecimal.ROUND_HALF_UP);
+ RoundingMode.HALF_UP);
}
@Override
@@ -98,7 +99,7 @@ public abstract class ELArithmetic {
@Override
protected Number divide(Number num0, Number num1) {
- return (new BigDecimal((BigInteger) num0)).divide(new
BigDecimal((BigInteger) num1), BigDecimal.ROUND_HALF_UP);
+ return (new BigDecimal((BigInteger) num0)).divide(new
BigDecimal((BigInteger) num1), RoundingMode.HALF_UP);
}
@Override
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java Mon
Oct 2 18:39:22 2017
@@ -38,7 +38,7 @@ public final class AstFloatingPoint exte
public Number getFloatingPoint() {
if (this.number == null) {
try {
- this.number = new Double(this.image);
+ this.number = Double.valueOf(this.image);
} catch (ArithmeticException e0) {
this.number = new BigDecimal(this.image);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstInteger.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstInteger.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstInteger.java Mon Oct 2
18:39:22 2017
@@ -38,7 +38,7 @@ public final class AstInteger extends Si
protected Number getInteger() {
if (this.number == null) {
try {
- this.number = new Long(this.image);
+ this.number = Long.valueOf(this.image);
} catch (ArithmeticException e1) {
this.number = new BigInteger(this.image);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstNegative.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstNegative.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstNegative.java Mon Oct 2
18:39:22 2017
@@ -56,7 +56,7 @@ public final class AstNegative extends S
}
if (obj instanceof String) {
if (isStringFloat((String) obj)) {
- return new Double(-Double.parseDouble((String) obj));
+ return Double.valueOf(-Double.parseDouble((String) obj));
}
return Long.valueOf(-Long.parseLong((String) obj));
}
@@ -64,13 +64,13 @@ public final class AstNegative extends S
return Long.valueOf(-((Long) obj).longValue());
}
if (obj instanceof Double) {
- return new Double(-((Double) obj).doubleValue());
+ return Double.valueOf(-((Double) obj).doubleValue());
}
if (obj instanceof Integer) {
return Integer.valueOf(-((Integer) obj).intValue());
}
if (obj instanceof Float) {
- return new Float(-((Float) obj).floatValue());
+ return Float.valueOf(-((Float) obj).floatValue());
}
if (obj instanceof Short) {
return Short.valueOf((short) -((Short) obj).shortValue());
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/Diagnostics.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/Diagnostics.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/Diagnostics.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/Diagnostics.java Mon Oct
2 18:39:22 2017
@@ -45,6 +45,7 @@ import java.lang.management.MemoryPoolMX
import java.lang.management.MemoryUsage;
import java.lang.management.MonitorInfo;
import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.PlatformLoggingMXBean;
import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
@@ -57,8 +58,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.LogManager;
-import java.util.logging.LoggingMXBean;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -95,8 +94,8 @@ public class Diagnostics {
// XXX Not sure whether the following MBeans should better
// be retrieved on demand, i.e. whether they can change
// dynamically in the MBeanServer.
- private static final LoggingMXBean loggingMXBean =
- LogManager.getLoggingMXBean();
+ private static final PlatformLoggingMXBean loggingMXBean =
+ ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class);
private static final MemoryMXBean memoryMXBean =
ManagementFactory.getMemoryMXBean();
private static final List<GarbageCollectorMXBean> garbageCollectorMXBeans =
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Mon Oct 2 18:39:22 2017
@@ -120,7 +120,7 @@ public class GenericNamingResourcesFacto
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;
}
@@ -128,7 +128,7 @@ public class GenericNamingResourcesFacto
}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;
}
Modified: tomcat/tc8.5.x/trunk/test/javax/el/TestArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/el/TestArrayELResolver.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/el/TestArrayELResolver.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/el/TestArrayELResolver.java Mon Oct 2
18:39:22 2017
@@ -49,7 +49,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Class<?> result = resolver.getType(context, base, new Integer(0));
+ Class<?> result = resolver.getType(context, base, Integer.valueOf(0));
Assert.assertEquals(base.getClass().getComponentType(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -65,7 +65,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.getType(context, base, new Integer(1));
+ resolver.getType(context, base, Integer.valueOf(1));
}
/**
@@ -112,7 +112,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Object result = resolver.getValue(context, base, new Integer(0));
+ Object result = resolver.getValue(context, base, Integer.valueOf(0));
Assert.assertEquals("element", result);
Assert.assertTrue(context.isPropertyResolved());
@@ -141,12 +141,12 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Object result = resolver.getValue(context, base, new Integer(1));
+ Object result = resolver.getValue(context, base, Integer.valueOf(1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
- result = resolver.getValue(context, base, new Integer(-1));
+ result = resolver.getValue(context, base, Integer.valueOf(-1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -192,16 +192,16 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(0), "new-element");
+ resolver.setValue(context, base, Integer.valueOf(0), "new-element");
Assert.assertEquals("new-element",
- resolver.getValue(context, base, new Integer(0)));
+ resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
- resolver.setValue(context, base, new Integer(0), null);
+ resolver.setValue(context, base, Integer.valueOf(0), null);
Assert.assertEquals(null,
- resolver.getValue(context, base, new Integer(0)));
+ resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -228,7 +228,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(1), "new-element");
+ resolver.setValue(context, base, Integer.valueOf(1), "new-element");
}
/**
@@ -242,7 +242,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(0), new Integer(1));
+ resolver.setValue(context, base, Integer.valueOf(0),
Integer.valueOf(1));
}
/**
@@ -256,7 +256,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
int[] base = new int[] { 1, 2, 3 };
- resolver.setValue(context, base, new Integer(1), Integer.valueOf(4));
+ resolver.setValue(context, base, Integer.valueOf(1),
Integer.valueOf(4));
Assert.assertEquals(Integer.valueOf(base[1]), Integer.valueOf(4));
}
@@ -304,14 +304,14 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- boolean result = resolver.isReadOnly(context, base, new Integer(0));
+ boolean result = resolver.isReadOnly(context, base,
Integer.valueOf(0));
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
resolver = new ArrayELResolver(true);
- result = resolver.isReadOnly(context, base, new Integer(0));
+ result = resolver.isReadOnly(context, base, Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -327,7 +327,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.isReadOnly(context, base, new Integer(1));
+ resolver.isReadOnly(context, base, Integer.valueOf(1));
}
/**
Modified: tomcat/tc8.5.x/trunk/test/javax/el/TestBeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/el/TestBeanELResolver.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/el/TestBeanELResolver.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/el/TestBeanELResolver.java Mon Oct 2
18:39:22 2017
@@ -331,7 +331,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.isReadOnly(context, new TesterBean(BEAN_NAME), new
Integer(0));
+ resolver.isReadOnly(context, new TesterBean(BEAN_NAME),
Integer.valueOf(0));
}
/**
Modified: tomcat/tc8.5.x/trunk/test/javax/el/TestListELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/el/TestListELResolver.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/el/TestListELResolver.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/el/TestListELResolver.java Mon Oct 2
18:39:22 2017
@@ -54,7 +54,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Object result = resolver.getValue(context, list, new Integer(0));
+ Object result = resolver.getValue(context, list, Integer.valueOf(0));
Assert.assertEquals("key", result);
Assert.assertTrue(context.isPropertyResolved());
@@ -85,12 +85,12 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Object result = resolver.getValue(context, list, new Integer(1));
+ Object result = resolver.getValue(context, list, Integer.valueOf(1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
- result = resolver.getValue(context, list, new Integer(-1));
+ result = resolver.getValue(context, list, Integer.valueOf(-1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -125,7 +125,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Class<?> result = resolver.getType(context, list, new Integer(0));
+ Class<?> result = resolver.getType(context, list, Integer.valueOf(0));
Assert.assertEquals(Object.class, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -142,7 +142,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.getType(context, list, new Integer(1));
+ resolver.getType(context, list, Integer.valueOf(1));
}
/**
@@ -187,10 +187,10 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("value");
- resolver.setValue(context, list, new Integer(0), "value");
+ resolver.setValue(context, list, Integer.valueOf(0), "value");
Assert.assertEquals("value",
- resolver.getValue(context, list, new Integer(0)));
+ resolver.getValue(context, list, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -204,7 +204,7 @@ public class TestListELResolver {
ELManager.getExpressionFactory());
List<Object> list = Collections.unmodifiableList(new ArrayList<>());
- resolver.setValue(context, list, new Integer(0), "value");
+ resolver.setValue(context, list, Integer.valueOf(0), "value");
}
/**
@@ -232,7 +232,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.setValue(context, list, new Integer(1), "value");
+ resolver.setValue(context, list, Integer.valueOf(1), "value");
}
/**
@@ -279,14 +279,14 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- boolean result = resolver.isReadOnly(context, list, new Integer(0));
+ boolean result = resolver.isReadOnly(context, list,
Integer.valueOf(0));
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
resolver = new ListELResolver(true);
- result = resolver.isReadOnly(context, list, new Integer(0));
+ result = resolver.isReadOnly(context, list, Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -305,7 +305,7 @@ public class TestListELResolver {
list.add("key");
List<String> unmodifiableList = Collections.unmodifiableList(list);
boolean result = resolver.isReadOnly(context, unmodifiableList,
- new Integer(0));
+ Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -322,7 +322,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.isReadOnly(context, list, new Integer(1));
+ resolver.isReadOnly(context, list, Integer.valueOf(1));
}
/**
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Mon Oct 2 18:39:22 2017
@@ -133,8 +133,8 @@ public class TestSendFile extends Tomcat
resp.setContentLengthLong(f.length());
if
(Boolean.TRUE.equals(req.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) {
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
f.getAbsolutePath());
- req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
- req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
+ req.setAttribute(Globals.SENDFILE_FILE_START_ATTR,
Long.valueOf(0));
+ req.setAttribute(Globals.SENDFILE_FILE_END_ATTR,
Long.valueOf(f.length()));
} else {
byte[] c = new byte[8192];
try (BufferedInputStream in = new BufferedInputStream(new
FileInputStream(f))) {
@@ -203,8 +203,8 @@ public class TestSendFile extends Tomcat
resp.setCharacterEncoding("ISO-8859-1");
resp.setContentLengthLong(file.length());
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
file.getAbsolutePath());
- req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
- req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(file.length()));
+ req.setAttribute(Globals.SENDFILE_FILE_START_ATTR,
Long.valueOf(0));
+ req.setAttribute(Globals.SENDFILE_FILE_END_ATTR,
Long.valueOf(file.length()));
file.delete();
} else {
byte[] c = new byte[1024];
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Mon Oct 2 18:39:22 2017
@@ -77,7 +77,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;
}
@@ -85,7 +85,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;
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java Mon Oct 2
18:39:22 2017
@@ -17,7 +17,7 @@
package org.apache.el;
import java.io.File;
-import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Collections;
import javax.servlet.DispatcherType;
@@ -467,7 +467,7 @@ public class TestELInJsp extends TomcatB
// Could hack something with HttpUtils...
// No obvious static fields for javax.servlet.jsp
// Wild card (package) import
- assertEcho(result, "01-" + BigDecimal.ROUND_UP);
+ assertEcho(result, "01-" + RoundingMode.HALF_UP);
// Class import
assertEcho(result, "02-" + Collections.EMPTY_LIST.size());
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
Mon Oct 2 18:39:22 2017
@@ -16,7 +16,7 @@
*/
package org.apache.jasper.runtime;
-import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Collections;
import javax.servlet.DispatcherType;
@@ -62,7 +62,7 @@ public class TestJspContextWrapper exten
// Could hack something with HttpUtils...
// No obvious status fields for javax.servlet.jsp
// Wild card (package) import
- Assert.assertTrue(result, result.contains("01-" +
BigDecimal.ROUND_UP));
+ Assert.assertTrue(result, result.contains("01-" +
RoundingMode.HALF_UP));
// Class import
Assert.assertTrue(result, result.contains("02-" +
Collections.EMPTY_LIST.size()));
}
Modified: tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag Mon Oct 2
18:39:22 2017
@@ -16,5 +16,5 @@
--%>
<%@tag import="java.math.*, java.util.Collections" %>
<p>00-${DispatcherType.ASYNC}</p>
-<p>01-${BigDecimal.ROUND_UP}</p>
+<p>01-${RoundingMode.HALF_UP}</p>
<p>02-${Collections.EMPTY_LIST.stream().count()}</p>
\ No newline at end of file
Modified: tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug57142.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug57142.jsp?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug57142.jsp (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/bug5nnnn/bug57142.jsp Mon Oct 2 18:39:22
2017
@@ -18,7 +18,7 @@
<html>
<body>
<p>00-${DispatcherType.ASYNC}</p>
- <p>01-${BigDecimal.ROUND_UP}</p>
+ <p>01-${RoundingMode.HALF_UP}</p>
<p>02-${Collections.EMPTY_LIST.stream().count()}</p>
</body>
</html>
\ No newline at end of file
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1810572&r1=1810571&r2=1810572&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Oct 2 18:39:22 2017
@@ -75,6 +75,10 @@
such attempted use of the endorsed directory mechanism will trigger an
error and Tomcat will fail to start. (rjung)
</fix>
+ <scode>
+ Refactoring in preparation for Java 9. Refactor to avoid using some
+ methods that will be deprecated in Java 9 onwards. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
