You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/04/20 18:56:45 UTC
svn commit: r1792112 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/
java/javax/security/auth/message/config/ java/javax/websocket/
java/javax/websocket/server/ java/org/apache/catalina/authenticator/jaspic/
java/org/apache/catalina/connector/ java/org/a...
Author: markt
Date: Thu Apr 20 18:56:45 2017
New Revision: 1792112
URL: http://svn.apache.org/viewvc?rev=1792112&view=rev
Log:
Back-port Java 9 newInstance() changes to reduce the diff between 9.0.x and 8.5.x
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java
tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java
tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 20 18:56:45 2017
@@ -1 +1 @@
-/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747
924,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-1756289,1756408-1756410,1
756778,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-1762053,1762123,1762168,176217
2,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,1768520,1768569,1768651,176
8762,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,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,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,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093
+/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747
924,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-1756289,1756408-1756410,1
756778,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-1762053,1762123,1762168,176217
2,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,1768520,1768569,1768651,176
8762,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,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,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,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442,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
Modified: tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java Thu Apr 20 18:56:45 2017
@@ -171,13 +171,14 @@ public abstract class ExpressionFactory
}
}
if (constructor == null) {
- result = (ExpressionFactory) clazz.newInstance();
+ result = (ExpressionFactory) clazz.getConstructor().newInstance();
} else {
result =
(ExpressionFactory) constructor.newInstance(properties);
}
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException e) {
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
+ NoSuchMethodException e) {
throw new ELException(
"Unable to create ExpressionFactory of type: " + clazz.getName(),
e);
Modified: tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Thu Apr 20 18:56:45 2017
@@ -16,6 +16,7 @@
*/
package javax.security.auth.message.config;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
@@ -65,13 +66,14 @@ public abstract class AuthConfigFactory
new PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
public AuthConfigFactory run() throws ClassNotFoundException,
- InstantiationException, IllegalAccessException {
+ InstantiationException, IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
// Load this class with the same class loader as used for
// this class. Note that the Thread context class loader
// should not be used since that would trigger a memory leak
// in container environments.
Class<?> clazz = Class.forName(className);
- return (AuthConfigFactory) clazz.newInstance();
+ return (AuthConfigFactory) clazz.getConstructor().newInstance();
}
});
} catch (PrivilegedActionException e) {
Modified: tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java Thu Apr 20 18:56:45 2017
@@ -16,6 +16,7 @@
*/
package javax.websocket;
+import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.ServiceLoader;
@@ -50,9 +51,10 @@ public abstract class ContainerProvider
Class<WebSocketContainer> clazz =
(Class<WebSocketContainer>) Class.forName(
DEFAULT_PROVIDER_CLASS_NAME);
- result = clazz.newInstance();
- } catch (ClassNotFoundException | InstantiationException |
- IllegalAccessException e) {
+ result = clazz.getConstructor().newInstance();
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
+ IllegalArgumentException | InvocationTargetException | NoSuchMethodException |
+ SecurityException e) {
// No options left. Just return null.
}
}
Modified: tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java Thu Apr 20 18:56:45 2017
@@ -16,6 +16,7 @@
*/
package javax.websocket.server;
+import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -175,9 +176,10 @@ public interface ServerEndpointConfig ex
Class<Configurator> clazz =
(Class<Configurator>) Class.forName(
DEFAULT_IMPL_CLASSNAME);
- result = clazz.newInstance();
- } catch (ClassNotFoundException | InstantiationException |
- IllegalAccessException e) {
+ result = clazz.getConstructor().newInstance();
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
+ IllegalArgumentException | InvocationTargetException |
+ NoSuchMethodException | SecurityException e) {
// No options left. Just return null.
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java Thu Apr 20 18:56:45 2017
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.authenticator.jaspic;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -113,10 +114,14 @@ public class SimpleServerAuthConfig impl
while (moduleClassName != null) {
try {
Class<?> clazz = Class.forName(moduleClassName);
- ServerAuthModule module = (ServerAuthModule) clazz.newInstance();
+ ServerAuthModule module =
+ (ServerAuthModule) clazz.getConstructor().newInstance();
module.initialize(null, null, handler, mergedProperties);
modules.add(module);
- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+ } catch (ClassNotFoundException | InstantiationException |
+ IllegalAccessException | IllegalArgumentException |
+ InvocationTargetException | NoSuchMethodException |
+ SecurityException e) {
AuthException ae = new AuthException();
ae.initCause(e);
throw ae;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java Thu Apr 20 18:56:45 2017
@@ -72,7 +72,7 @@ public class Connector extends Lifecycle
ProtocolHandler p = null;
try {
Class<?> clazz = Class.forName(protocolHandlerClassName);
- p = (ProtocolHandler) clazz.newInstance();
+ p = (ProtocolHandler) clazz.getConstructor().newInstance();
} catch (Exception e) {
log.error(sm.getString(
"coyoteConnector.protocolHandlerInstantiationFailed"), e);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Thu Apr 20 18:56:45 2017
@@ -1986,14 +1986,17 @@ public class Request implements org.apac
T handler;
InstanceManager instanceManager = null;
try {
- // Do not go through the instance manager for internal Tomcat classes since they don't need injection
+ // Do not go through the instance manager for internal Tomcat classes since they don't
+ // need injection
if (InternalHttpUpgradeHandler.class.isAssignableFrom(httpUpgradeHandlerClass)) {
- handler = httpUpgradeHandlerClass.newInstance();
+ handler = httpUpgradeHandlerClass.getConstructor().newInstance();
} else {
instanceManager = getContext().getInstanceManager();
handler = (T) instanceManager.newInstance(httpUpgradeHandlerClass);
}
- } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NamingException e) {
+ } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
+ NamingException | IllegalArgumentException | NoSuchMethodException |
+ SecurityException e) {
throw new ServletException(e);
}
UpgradeToken upgradeToken = new UpgradeToken(handler,
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Apr 20 18:56:45 2017
@@ -813,7 +813,7 @@ public class ApplicationContext implemen
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
} catch (IllegalAccessException | NamingException | InstantiationException |
- ClassNotFoundException e) {
+ ClassNotFoundException | NoSuchMethodException e) {
throw new ServletException(e);
}
}
@@ -947,7 +947,7 @@ public class ApplicationContext implemen
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
} catch (IllegalAccessException | NamingException | InstantiationException |
- ClassNotFoundException e) {
+ ClassNotFoundException | NoSuchMethodException e) {
throw new ServletException(e);
}
}
@@ -1088,7 +1088,7 @@ public class ApplicationContext implemen
"applicationContext.addListener.iae.cnfe", className),
e);
} catch (IllegalAccessException | NamingException | InstantiationException |
- ClassNotFoundException e) {
+ ClassNotFoundException | NoSuchMethodException e) {
throw new IllegalArgumentException(sm.getString(
"applicationContext.addListener.iae.cnfe", className),
e);
@@ -1160,7 +1160,8 @@ public class ApplicationContext implemen
} catch (InvocationTargetException e) {
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
- } catch (IllegalAccessException | NamingException | InstantiationException e) {
+ } catch (IllegalAccessException | NamingException | InstantiationException |
+ NoSuchMethodException e) {
throw new ServletException(e);
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Thu Apr 20 18:56:45 2017
@@ -90,11 +90,14 @@ public final class ApplicationFilterConf
* @exception ServletException if thrown by the filter's init() method
* @throws NamingException
* @throws InvocationTargetException
+ * @throws SecurityException
+ * @throws NoSuchMethodException
+ * @throws IllegalArgumentException
*/
ApplicationFilterConfig(Context context, FilterDef filterDef)
- throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException,
- ServletException, InvocationTargetException, NamingException {
+ throws ClassCastException, ClassNotFoundException, IllegalAccessException,
+ InstantiationException, ServletException, InvocationTargetException, NamingException,
+ IllegalArgumentException, NoSuchMethodException, SecurityException {
super();
@@ -244,10 +247,13 @@ public final class ApplicationFilterConf
* @exception ServletException if thrown by the filter's init() method
* @throws NamingException
* @throws InvocationTargetException
- */
- Filter getFilter() throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException, ServletException,
- InvocationTargetException, NamingException {
+ * @throws SecurityException
+ * @throws NoSuchMethodException
+ * @throws IllegalArgumentException
+ */
+ Filter getFilter() throws ClassCastException, ClassNotFoundException, IllegalAccessException,
+ InstantiationException, ServletException, InvocationTargetException, NamingException,
+ IllegalArgumentException, NoSuchMethodException, SecurityException {
// Return the existing filter instance, if any
if (this.filter != null)
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu Apr 20 18:56:45 2017
@@ -107,25 +107,26 @@ public class DefaultInstanceManager impl
@Override
public Object newInstance(Class<?> clazz) throws IllegalAccessException,
- InvocationTargetException, NamingException, InstantiationException {
- return newInstance(clazz.newInstance(), clazz);
+ InvocationTargetException, NamingException, InstantiationException,
+ IllegalArgumentException, NoSuchMethodException, SecurityException {
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
public Object newInstance(String className) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
- ClassNotFoundException {
+ ClassNotFoundException, IllegalArgumentException, NoSuchMethodException, SecurityException {
Class<?> clazz = loadClassMaybePrivileged(className, classLoader);
- return newInstance(clazz.newInstance(), clazz);
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
public Object newInstance(final String className, final ClassLoader classLoader)
- throws IllegalAccessException, NamingException,
- InvocationTargetException, InstantiationException,
- ClassNotFoundException {
+ throws IllegalAccessException, NamingException, InvocationTargetException,
+ InstantiationException, ClassNotFoundException, IllegalArgumentException,
+ NoSuchMethodException, SecurityException {
Class<?> clazz = classLoader.loadClass(className);
- return newInstance(clazz.newInstance(), clazz);
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu Apr 20 18:56:45 2017
@@ -1353,7 +1353,7 @@ public class StandardContext extends Con
if (this.charsetMapper == null) {
try {
Class<?> clazz = Class.forName(charsetMapperClass);
- this.charsetMapper = (CharsetMapper) clazz.newInstance();
+ this.charsetMapper = (CharsetMapper) clazz.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
this.charsetMapper = new CharsetMapper();
@@ -3274,11 +3274,11 @@ public class StandardContext extends Con
Wrapper wrapper = null;
if (wrapperClass != null) {
try {
- wrapper = (Wrapper) wrapperClass.newInstance();
+ wrapper = (Wrapper) wrapperClass.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("createWrapper", t);
- return (null);
+ return null;
}
} else {
wrapper = new StandardWrapper();
@@ -3289,12 +3289,12 @@ public class StandardContext extends Con
try {
Class<?> clazz = Class.forName(wrapperLifecycles[i]);
LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ (LifecycleListener) clazz.getConstructor().newInstance();
wrapper.addLifecycleListener(listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("createWrapper", t);
- return (null);
+ return null;
}
}
}
@@ -3304,18 +3304,17 @@ public class StandardContext extends Con
try {
Class<?> clazz = Class.forName(wrapperListeners[i]);
ContainerListener listener =
- (ContainerListener) clazz.newInstance();
+ (ContainerListener) clazz.getConstructor().newInstance();
wrapper.addContainerListener(listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("createWrapper", t);
- return (null);
+ return null;
}
}
}
- return (wrapper);
-
+ return wrapper;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java Thu Apr 20 18:56:45 2017
@@ -859,7 +859,7 @@ public class StandardHost extends Contai
}
if(!found) {
Valve valve =
- (Valve) Class.forName(errorValve).newInstance();
+ (Valve) Class.forName(errorValve).getConstructor().newInstance();
getPipeline().addValve(valve);
}
} catch (Throwable t) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java Thu Apr 20 18:56:45 2017
@@ -22,21 +22,21 @@ import javax.naming.NamingException;
public interface InstanceManager {
- public Object newInstance(Class<?> clazz)
- throws IllegalAccessException, InvocationTargetException, NamingException,
- InstantiationException;
-
- public Object newInstance(String className)
- throws IllegalAccessException, InvocationTargetException, NamingException,
- InstantiationException, ClassNotFoundException;
-
- public Object newInstance(String fqcn, ClassLoader classLoader)
- throws IllegalAccessException, InvocationTargetException, NamingException,
- InstantiationException, ClassNotFoundException;
+ Object newInstance(Class<?> clazz) throws IllegalAccessException, InvocationTargetException,
+ NamingException, InstantiationException, IllegalArgumentException,
+ NoSuchMethodException, SecurityException;
+
+ Object newInstance(String className) throws IllegalAccessException, InvocationTargetException,
+ NamingException, InstantiationException, ClassNotFoundException,
+ IllegalArgumentException, NoSuchMethodException, SecurityException;
+
+ Object newInstance(String fqcn, ClassLoader classLoader) throws IllegalAccessException,
+ InvocationTargetException, NamingException, InstantiationException,
+ ClassNotFoundException, IllegalArgumentException, NoSuchMethodException,
+ SecurityException;
- public void newInstance(Object o)
- throws IllegalAccessException, InvocationTargetException, NamingException;
+ void newInstance(Object o)
+ throws IllegalAccessException, InvocationTargetException, NamingException;
- public void destroyInstance(Object o)
- throws IllegalAccessException, InvocationTargetException;
+ void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException;
}
Modified: tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1792112&r1=1792111&r2=1792112&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java (original)
+++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java Thu Apr 20 18:56:45 2017
@@ -111,8 +111,7 @@ public class TestSlowQueryComparator {
SecurityException, NoSuchMethodException {
Class<?> comparatorClass = Class
.forName("org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport$QueryStatsComparator");
- Constructor<?> comparatorConstructor = comparatorClass
- .getDeclaredConstructor();
+ Constructor<?> comparatorConstructor = comparatorClass.getConstructor();
comparatorConstructor.setAccessible(true);
@SuppressWarnings("unchecked")
Comparator<QueryStats> queryStatsComparator = (Comparator<QueryStats>) comparatorConstructor
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org