Author: markt
Date: Fri Oct 6 09:16:33 2017
New Revision: 1811307
URL: http://svn.apache.org/viewvc?rev=1811307&view=rev
Log:
Fix some more deprecation warnings when building with Java 9.
Use of Class.newInstance()
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc8.5.x/trunk/java/org/apache/juli/FileHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TesterFactory.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 6 09:16:33 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,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,1800617,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,1806973,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,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811235,1811246
+/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,1800617,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,1806973,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,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
Fri Oct 6 09:16:33 2017
@@ -78,8 +78,8 @@ public abstract class CsrfPreventionFilt
try {
Class<?> clazz = Class.forName(randomClass);
- randomSource = (Random) clazz.newInstance();
- } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e) {
+ randomSource = (Random) clazz.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
ServletException se = new ServletException(sm.getString(
"csrfPrevention.invalidRandomClass", randomClass), e);
throw se;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Fri Oct 6 09:16:33 2017
@@ -153,12 +153,12 @@ public abstract class ClusterManagerBase
copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm());
if (getSessionIdGenerator() != null) {
try {
- SessionIdGenerator copyIdGenerator =
sessionIdGeneratorClass.newInstance();
+ SessionIdGenerator copyIdGenerator =
sessionIdGeneratorClass.getConstructor().newInstance();
copyIdGenerator.setSessionIdLength(getSessionIdGenerator().getSessionIdLength());
copyIdGenerator.setJvmRoute(getSessionIdGenerator().getJvmRoute());
copy.setSessionIdGenerator(copyIdGenerator);
- } catch (InstantiationException | IllegalAccessException e) {
- // Ignore
+ } catch (ReflectiveOperationException e) {
+ // Ignore
}
}
copy.setRecordAllActions(isRecordAllActions());
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Fri Oct 6 09:16:33 2017
@@ -1596,7 +1596,7 @@ public abstract class WebappClassLoaderB
Class<?> lpClass =
defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
classBytes, 0, offset,
this.getClass().getProtectionDomain());
- Object obj = lpClass.newInstance();
+ Object obj = lpClass.getConstructor().newInstance();
@SuppressWarnings("unchecked")
List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
Fri Oct 6 09:16:33 2017
@@ -70,7 +70,7 @@ public class ContainerMBean extends Base
public void addChild(String type, String name) throws MBeanException{
Container contained = null;
try {
- contained = (Container)Class.forName(type).newInstance();
+ contained =
(Container)Class.forName(type).getConstructor().newInstance();
contained.setName(name);
if(contained instanceof StandardHost){
@@ -81,11 +81,7 @@ public class ContainerMBean extends Base
contained.addLifecycleListener(config);
}
- } catch (InstantiationException e) {
- throw new MBeanException(e);
- } catch (IllegalAccessException e) {
- throw new MBeanException(e);
- } catch (ClassNotFoundException e) {
+ } catch (ReflectiveOperationException e) {
throw new MBeanException(e);
}
@@ -146,12 +142,8 @@ public class ContainerMBean extends Base
public String addValve(String valveType) throws MBeanException{
Valve valve = null;
try {
- valve = (Valve)Class.forName(valveType).newInstance();
- } catch (InstantiationException e) {
- throw new MBeanException(e);
- } catch (IllegalAccessException e) {
- throw new MBeanException(e);
- } catch (ClassNotFoundException e) {
+ valve =
(Valve)Class.forName(valveType).getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new MBeanException(e);
}
@@ -228,12 +220,8 @@ public class ContainerMBean extends Base
public void addLifecycleListener(String type) throws MBeanException{
LifecycleListener listener = null;
try {
- listener = (LifecycleListener)Class.forName(type).newInstance();
- } catch (InstantiationException e) {
- throw new MBeanException(e);
- } catch (IllegalAccessException e) {
- throw new MBeanException(e);
- } catch (ClassNotFoundException e) {
+ listener =
(LifecycleListener)Class.forName(type).getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new MBeanException(e);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Fri
Oct 6 09:16:33 2017
@@ -671,7 +671,7 @@ public class MBeanFactory {
throw new IllegalArgumentException();
}
- Valve valve = (Valve) Class.forName(className).newInstance();
+ Valve valve = (Valve)
Class.forName(className).getConstructor().newInstance();
container.getPipeline().addValve(valve);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java Fri
Oct 6 09:16:33 2017
@@ -92,12 +92,8 @@ public class ServiceMBean extends BaseMo
Executor executor;
try {
- executor = (Executor)Class.forName(type).newInstance();
- } catch (InstantiationException e) {
- throw new MBeanException(e);
- } catch (IllegalAccessException e) {
- throw new MBeanException(e);
- } catch (ClassNotFoundException e) {
+ executor =
(Executor)Class.forName(type).getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new MBeanException(e);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
Fri Oct 6 09:16:33 2017
@@ -243,8 +243,8 @@ public class JAASMemoryLoginModule exten
if (option instanceof String) {
try {
Class<?> clazz = Class.forName((String) option);
- credentialHandler = (CredentialHandler) clazz.newInstance();
- } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException e) {
+ credentialHandler = (CredentialHandler)
clazz.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new IllegalArgumentException(e);
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Fri Oct
6 09:16:33 2017
@@ -654,7 +654,7 @@ public class JDBCRealm
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
throw new SQLException(e.getMessage(), e);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Oct
6 09:16:33 2017
@@ -1209,8 +1209,7 @@ public class JNDIRealm extends RealmBase
"jndiRealm.invalidHostnameVerifier",
hostNameVerifierClassName));
}
- } catch (ClassNotFoundException | SecurityException
- | InstantiationException | IllegalAccessException e) {
+ } catch (ReflectiveOperationException | SecurityException e) {
throw new IllegalArgumentException(sm.getString(
"jndiRealm.invalidHostnameVerifier",
hostNameVerifierClassName), e);
@@ -1254,10 +1253,9 @@ public class JNDIRealm extends RealmBase
}
private Object constructInstance(String className)
- throws ClassNotFoundException, InstantiationException,
- IllegalAccessException {
+ throws ReflectiveOperationException {
Class<?> clazz = Class.forName(className);
- return clazz.newInstance();
+ return clazz.getConstructor().newInstance();
}
// ---------------------------------------------------------- Realm Methods
@@ -2454,8 +2452,7 @@ public class JNDIRealm extends RealmBase
"jndiRealm.invalidSslSocketFactory",
className));
}
- } catch (ClassNotFoundException | SecurityException
- | InstantiationException | IllegalAccessException e) {
+ } catch (ReflectiveOperationException | SecurityException e) {
throw new IllegalArgumentException(sm.getString(
"jndiRealm.invalidSslSocketFactory",
className), e);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Fri Oct 6 09:16:33 2017
@@ -68,9 +68,7 @@ realmBase.authenticateSuccess=Username [
realmBase.gssNameFail=Failed to extract name from established GSSContext
realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an
X509UsernameRetriever.
-realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class
[{0}].
-realmBase.createUsernameRetriever.InstantiationException=Cannot create object
of type [{0}].
-realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object
of type [{0}].
+realmBase.createUsernameRetriever.newInstance=Cannot create object of type
[{0}].
realmBase.credentialHandler.customCredentialHandler=Unable to set the property
[{0}] to value [{1}] as a custom CredentialHandler has been configured
realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
realmBase.gssContextNotEstablished=Authenticator implementation error: the
passed security context is not fully established
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Oct
6 09:16:33 2017
@@ -1423,11 +1423,11 @@ public abstract class RealmBase extends
if (handlerClassName == null) {
for (Class<? extends DigestCredentialHandlerBase> clazz :
credentialHandlerClasses) {
try {
- handler = clazz.newInstance();
+ handler = clazz.getConstructor().newInstance();
if (IntrospectionUtils.setProperty(handler, "algorithm",
algorithm)) {
break;
}
- } catch (InstantiationException | IllegalAccessException e) {
+ } catch (ReflectiveOperationException e) {
// This isn't good.
throw new RuntimeException(e);
}
@@ -1435,10 +1435,9 @@ public abstract class RealmBase extends
} else {
try {
Class<?> clazz = Class.forName(handlerClassName);
- handler = (DigestCredentialHandlerBase) clazz.newInstance();
+ handler = (DigestCredentialHandlerBase)
clazz.getConstructor().newInstance();
IntrospectionUtils.setProperty(handler, "algorithm",
algorithm);
- } catch (InstantiationException | IllegalAccessException
- | ClassNotFoundException e) {
+ } catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}
@@ -1569,13 +1568,9 @@ public abstract class RealmBase extends
try {
@SuppressWarnings("unchecked")
Class<? extends X509UsernameRetriever> clazz = (Class<? extends
X509UsernameRetriever>)Class.forName(className);
- return clazz.newInstance();
- } catch (ClassNotFoundException e) {
- throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.ClassNotFoundException",
className), e);
- } catch (InstantiationException e) {
- throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.InstantiationException",
className), e);
- } catch (IllegalAccessException e) {
- throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.IllegalAccessException",
className), e);
+ return clazz.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
+ throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.newInstance",
className), e);
} catch (ClassCastException e) {
throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.ClassCastException",
className), e);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Fri Oct 6 09:16:33 2017
@@ -170,7 +170,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "http11.Constants");
// Make sure system property is read at this point
Class<?> clazz = loader.loadClass(basePackage + "Constants");
- clazz.newInstance();
+ clazz.getConstructor().newInstance();
loader.loadClass(basePackage + "http2.Stream$1");
}
@@ -282,7 +282,7 @@ public final class SecurityClassLoad {
// collections
Class<?> clazz = loader.loadClass(basePackage +
"util.collections.CaseInsensitiveKeyMap");
// Ensure StringManager is configured
- clazz.newInstance();
+ clazz.getConstructor().newInstance();
loader.loadClass(basePackage +
"util.collections.CaseInsensitiveKeyMap$EntryImpl");
loader.loadClass(basePackage +
"util.collections.CaseInsensitiveKeyMap$EntryIterator");
loader.loadClass(basePackage +
"util.collections.CaseInsensitiveKeyMap$EntrySet");
@@ -292,7 +292,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.http.NamesEnumerator");
// Make sure system property is read at this point
clazz = loader.loadClass(basePackage + "util.http.FastHttpDateFormat");
- clazz.newInstance();
+ clazz.getConstructor().newInstance();
loader.loadClass(basePackage + "util.http.parser.HttpParser");
loader.loadClass(basePackage + "util.http.parser.MediaType");
loader.loadClass(basePackage + "util.http.parser.MediaTypeCache");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java Fri
Oct 6 09:16:33 2017
@@ -919,8 +919,8 @@ public class JDBCStore extends StoreBase
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.newInstance();
- } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e) {
+ driver = (Driver) clazz.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
manager.getContext().getLogger().error(
sm.getString(getStoreName() +
".checkConnectionClassNotFoundException",
e.toString()));
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java Fri
Oct 6 09:16:33 2017
@@ -377,11 +377,9 @@ public abstract class ManagerBase extend
return sessionIdGenerator;
} else if (sessionIdGeneratorClass != null) {
try {
- sessionIdGenerator = sessionIdGeneratorClass.newInstance();
+ sessionIdGenerator =
sessionIdGeneratorClass.getConstructor().newInstance();
return sessionIdGenerator;
- } catch(IllegalAccessException ex) {
- // Ignore
- } catch(InstantiationException ex) {
+ } catch(ReflectiveOperationException ex) {
// Ignore
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Fri
Oct 6 09:16:33 2017
@@ -263,10 +263,8 @@ public final class Bootstrap {
// Load our startup class and call its process() method
if (log.isDebugEnabled())
log.debug("Loading startup class");
- Class<?> startupClass =
- catalinaLoader.loadClass
- ("org.apache.catalina.startup.Catalina");
- Object startupInstance = startupClass.newInstance();
+ Class<?> startupClass =
catalinaLoader.loadClass("org.apache.catalina.startup.Catalina");
+ Object startupInstance = startupClass.getConstructor().newInstance();
// Set the shared extensions class loader
if (log.isDebugEnabled())
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Fri Oct 6 09:16:33 2017
@@ -399,7 +399,7 @@ public class ContextConfig implements Li
// Instantiate and install an Authenticator of the requested class
try {
Class<?> authenticatorClass = Class.forName(authenticatorName);
- authenticator = (Valve) authenticatorClass.newInstance();
+ authenticator = (Valve)
authenticatorClass.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString(
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostConfig.java Fri
Oct 6 09:16:33 2017
@@ -593,8 +593,7 @@ public class HostConfig implements Lifec
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setConfigFile(contextXml.toURI().toURL());
@@ -901,7 +900,7 @@ public class HostConfig implements Lifec
cn.getPath(), Constants.ApplicationContextXml,
new File(host.getConfigBaseFile(), cn.getBaseName() +
".xml")));
} else {
- context = (Context) Class.forName(contextClass).newInstance();
+ context = (Context)
Class.forName(contextClass).getConstructor().newInstance();
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -977,8 +976,7 @@ public class HostConfig implements Lifec
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setName(cn.getName());
@@ -1129,12 +1127,11 @@ public class HostConfig implements Lifec
cn.getPath(), xml, xmlCopy));
context = new FailedContext();
} else {
- context = (Context) Class.forName(contextClass).newInstance();
+ context = (Context)
Class.forName(contextClass).getConstructor().newInstance();
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setName(cn.getName());
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
Fri Oct 6 09:16:33 2017
@@ -124,8 +124,7 @@ public class LifecycleListenerRule exten
// Instantiate a new LifecycleListener implementation object
Class<?> clazz = Class.forName(className);
- LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
// Add this LifecycleListener to our associated component
c.addLifecycleListener(listener);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Oct
6 09:16:33 2017
@@ -595,8 +595,8 @@ public class Tomcat {
LifecycleListener listener = null;
try {
Class<?> clazz = Class.forName(getHost().getConfigClass());
- listener = (LifecycleListener) clazz.newInstance();
- } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e) {
+ listener = (LifecycleListener)
clazz.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
// Wrap in IAE since we can't easily change the method signature to
// to throw the specific checked exceptions
throw new IllegalArgumentException(e);
@@ -1033,10 +1033,8 @@ public class Tomcat {
if (singleThreadModel) {
Servlet instance;
try {
- instance = existing.getClass().newInstance();
- } catch (InstantiationException e) {
- throw new ServletException(e);
- } catch (IllegalAccessException e) {
+ instance =
existing.getClass().getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new ServletException(e);
}
instance.init(facade);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/UserConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/UserConfig.java Fri
Oct 6 09:16:33 2017
@@ -309,7 +309,7 @@ public final class UserConfig
UserDatabase database = null;
try {
Class<?> clazz = Class.forName(userClass);
- database = (UserDatabase) clazz.newInstance();
+ database = (UserDatabase) clazz.getConstructor().newInstance();
database.setUserConfig(this);
} catch (Exception e) {
host.getLogger().error(sm.getString("userConfig.database"), e);
@@ -360,13 +360,11 @@ public final class UserConfig
// Deploy the web application for this user
try {
Class<?> clazz = Class.forName(contextClass);
- Context context =
- (Context) clazz.newInstance();
+ Context context = (Context) clazz.getConstructor().newInstance();
context.setPath(contextPath);
context.setDocBase(app.toString());
clazz = Class.forName(configClass);
- LifecycleListener listener =
- (LifecycleListener) clazz.newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
host.addChild(context);
} catch (Exception e) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
Fri Oct 6 09:16:33 2017
@@ -186,9 +186,8 @@ public class WebappServiceLoader<T> {
for (String serviceClass : servicesFound) {
try {
Class<?> clazz = Class.forName(serviceClass, true, loader);
- services.add(serviceType.cast(clazz.newInstance()));
- } catch (ClassNotFoundException | InstantiationException |
- IllegalAccessException | ClassCastException e) {
+
services.add(serviceType.cast(clazz.getConstructor().newInstance()));
+ } catch (ReflectiveOperationException | ClassCastException e) {
throw new IOException(e);
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
Fri Oct 6 09:16:33 2017
@@ -318,12 +318,10 @@ public class StoreAppender {
*
* @param bean The bean
* @return an object from same class as bean parameter
- * @throws InstantiationException Error creating a new instance
- * @throws IllegalAccessException Another error occurred
+ * @throws ReflectiveOperationException Error creating a new instance
*/
- public Object defaultInstance(Object bean) throws InstantiationException,
- IllegalAccessException {
- return bean.getClass().newInstance();
+ public Object defaultInstance(Object bean) throws
ReflectiveOperationException {
+ return bean.getClass().getConstructor().newInstance();
}
/**
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Fri Oct 6 09:16:33 2017
@@ -84,7 +84,7 @@ public class StoreConfigLifecycleListene
try {
Class<?> clazz = Class.forName(getStoreConfigClass(), true, this
.getClass().getClassLoader());
- storeConfig = (IStoreConfig) clazz.newInstance();
+ storeConfig = (IStoreConfig) clazz.getConstructor().newInstance();
if (null == getStoreRegistry())
// default Loading
loader.load();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
Fri Oct 6 09:16:33 2017
@@ -154,8 +154,7 @@ public class StoreContextAppender extend
* @see
org.apache.catalina.storeconfig.StoreAppender#defaultInstance(java.lang.Object)
*/
@Override
- public Object defaultInstance(Object bean) throws InstantiationException,
- IllegalAccessException {
+ public Object defaultInstance(Object bean) throws
ReflectiveOperationException {
if (bean instanceof StandardContext) {
StandardContext defaultContext = new StandardContext();
/*
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
Fri Oct 6 09:16:33 2017
@@ -107,13 +107,10 @@ public class StoreFactoryRule extends Ru
* @param defaultName Default Class
* @param attributes current digester attribute elements
* @return new configured object instance
- * @throws ClassNotFoundException Class was not found
- * @throws InstantiationException Error creating an instance
- * @throws IllegalAccessException Security exception
+ * @throws ReflectiveOperationException Error creating an instance
*/
protected Object newInstance(String attr, String defaultName,
- Attributes attributes) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException {
+ Attributes attributes) throws ReflectiveOperationException {
String className = defaultName;
if (attr != null) {
String value = attributes.getValue(attr);
@@ -121,6 +118,6 @@ public class StoreFactoryRule extends Ru
className = value;
}
Class<?> clazz = Class.forName(className);
- return clazz.newInstance();
+ return clazz.getConstructor().newInstance();
}
}
\ No newline at end of file
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
Fri Oct 6 09:16:33 2017
@@ -220,7 +220,7 @@ public abstract class SessionIdGenerator
try {
// Construct and seed a new random number generator
Class<?> clazz = Class.forName(secureRandomClass);
- result = (SecureRandom) clazz.newInstance();
+ result = (SecureRandom) clazz.getConstructor().newInstance();
} catch (Exception e) {
log.error(sm.getString("sessionIdGeneratorBase.random",
secureRandomClass), e);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Fri Oct 6 09:16:33 2017
@@ -568,7 +568,7 @@ public final class JDBCAccessLogValve ex
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
throw new SQLException(e.getMessage(), e);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Fri Oct 6 09:16:33 2017
@@ -652,7 +652,8 @@ public class RewriteValve extends ValveB
String rewriteMapClassName = tokenizer.nextToken();
RewriteMap map = null;
try {
- map = (RewriteMap)
(Class.forName(rewriteMapClassName).newInstance());
+ map = (RewriteMap) (Class.forName(
+
rewriteMapClassName).getConstructor().newInstance());
} catch (Exception e) {
throw new IllegalArgumentException("Invalid map className:
" + line);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java Fri
Oct 6 09:16:33 2017
@@ -242,19 +242,13 @@ public class JspCompilationContext {
protected Compiler createCompiler(String className) {
Compiler compiler = null;
try {
- compiler = (Compiler) Class.forName(className).newInstance();
- } catch (InstantiationException e) {
- log.warn(Localizer.getMessage("jsp.error.compiler"), e);
- } catch (IllegalAccessException e) {
- log.warn(Localizer.getMessage("jsp.error.compiler"), e);
- } catch (NoClassDefFoundError e) {
- if (log.isDebugEnabled()) {
- log.debug(Localizer.getMessage("jsp.error.compiler"), e);
- }
- } catch (ClassNotFoundException e) {
+ compiler = (Compiler)
Class.forName(className).getConstructor().newInstance();
+ } catch (NoClassDefFoundError | ClassNotFoundException e) {
if (log.isDebugEnabled()) {
log.debug(Localizer.getMessage("jsp.error.compiler"), e);
}
+ } catch (ReflectiveOperationException e) {
+ log.warn(Localizer.getMessage("jsp.error.compiler"), e);
}
return compiler;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
Fri Oct 6 09:16:33 2017
@@ -85,7 +85,7 @@ public class ELInterpreterFactory {
private static ELInterpreter createInstance(ServletContext context,
String className) throws Exception {
return (ELInterpreter) context.getClassLoader().loadClass(
- className).newInstance();
+ className).getConstructor().newInstance();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Fri Oct 6 09:16:33 2017
@@ -593,7 +593,7 @@ class TagFileProcessor {
// Dependent list. The only reliable dependency information
// can only be obtained from the tag instance.
try {
- Object tagIns = tagClazz.newInstance();
+ Object tagIns =
tagClazz.getConstructor().newInstance();
if (tagIns instanceof JspSourceDependent) {
Iterator<Entry<String,Long>> iter =
((JspSourceDependent)
tagIns).getDependants().entrySet().iterator();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Fri Oct 6 09:16:33 2017
@@ -290,7 +290,7 @@ class TagLibraryInfoImpl extends TagLibr
if (teiClassName != null && !teiClassName.isEmpty()) {
try {
Class<?> teiClass =
ctxt.getClassLoader().loadClass(teiClassName);
- tei = (TagExtraInfo) teiClass.newInstance();
+ tei = (TagExtraInfo) teiClass.getConstructor().newInstance();
} catch (Exception e) {
err.jspError(e, "jsp.error.teiclass.instantiation",
teiClassName);
}
@@ -346,7 +346,7 @@ class TagLibraryInfoImpl extends TagLibr
try {
Class<?> tlvClass =
ctxt.getClassLoader().loadClass(validatorClass);
- TagLibraryValidator tlv = (TagLibraryValidator)
tlvClass.newInstance();
+ TagLibraryValidator tlv = (TagLibraryValidator)
tlvClass.getConstructor().newInstance();
tlv.setInitParameters(initParams);
return tlv;
} catch (Exception e) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
Fri Oct 6 09:16:33 2017
@@ -123,7 +123,7 @@ public class TagPluginManager {
String tagClass = entry.getKey();
String pluginName = entry.getValue();
Class<?> pluginClass =
ctxt.getClassLoader().loadClass(pluginName);
- TagPlugin plugin = (TagPlugin) pluginClass.newInstance();
+ TagPlugin plugin = (TagPlugin)
pluginClass.getConstructor().newInstance();
tagPlugins.put(tagClass, plugin);
} catch (Exception e) {
err.jspError(e);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
Fri Oct 6 09:16:33 2017
@@ -783,8 +783,7 @@ public class JspRuntimeLibrary {
throws JasperException
{
try {
- PropertyEditor pe =
- (PropertyEditor)propertyEditorClass.newInstance();
+ PropertyEditor pe =
(PropertyEditor)propertyEditorClass.getConstructor().newInstance();
pe.setAsText(attrValue);
return pe.getValue();
} catch (Exception ex) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Fri
Oct 6 09:16:33 2017
@@ -47,7 +47,7 @@ public class TagHandlerPool {
if (tpClassName != null) {
try {
Class<?> c = Class.forName(tpClassName);
- result = (TagHandlerPool) c.newInstance();
+ result = (TagHandlerPool) c.getConstructor().newInstance();
} catch (Exception e) {
e.printStackTrace();
result = null;
@@ -112,7 +112,7 @@ public class TagHandlerPool {
return (Tag) instanceManager.newInstance(
handlerClass.getName(), handlerClass.getClassLoader());
} else {
- Tag instance = handlerClass.newInstance();
+ Tag instance = handlerClass.getConstructor().newInstance();
instanceManager.newInstance(instance);
return instance;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Fri Oct 6 09:16:33 2017
@@ -294,7 +294,7 @@ public class JspServletWrapper {
tagHandlerClass = ctxt.load();
reload = false;
}
- target = tagHandlerClass.newInstance();
+ target = tagHandlerClass.getConstructor().newInstance();
} else {
target = getServlet();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Fri
Oct 6 09:16:33 2017
@@ -578,8 +578,8 @@ public class ClassLoaderLogManager exten
}
try {
this.prefix.set(prefix);
- Handler handler =
- (Handler)
classLoader.loadClass(handlerClassName).newInstance();
+ Handler handler = (Handler) classLoader.loadClass(
+ handlerClassName).getConstructor().newInstance();
// The specification strongly implies all configuration
should be done
// during the creation of the handler object.
// This includes setting level, filter, formatter and
encoding.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/FileHandler.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/FileHandler.java Fri Oct 6
09:16:33 2017
@@ -433,7 +433,7 @@ public class FileHandler extends Handler
String filterName = getProperty(className + ".filter", null);
if (filterName != null) {
try {
- setFilter((Filter) cl.loadClass(filterName).newInstance());
+ setFilter((Filter)
cl.loadClass(filterName).getConstructor().newInstance());
} catch (Exception e) {
// Ignore
}
@@ -443,7 +443,8 @@ public class FileHandler extends Handler
String formatterName = getProperty(className + ".formatter", null);
if (formatterName != null) {
try {
- setFormatter((Formatter)
cl.loadClass(formatterName).newInstance());
+ setFormatter((Formatter) cl.loadClass(
+ formatterName).getConstructor().newInstance());
} catch (Exception e) {
// Ignore and fallback to defaults
setFormatter(new OneLineFormatter());
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java Fri Oct
6 09:16:33 2017
@@ -42,11 +42,12 @@ class DirectJDKLog implements Log {
// default configuration - it sucks. Let's override at least the
// formatter for the console
try {
- Class.forName(SIMPLE_CFG).newInstance();
+ Class.forName(SIMPLE_CFG).getConstructor().newInstance();
} catch( Throwable t ) {
}
try {
- Formatter
fmt=(Formatter)Class.forName(System.getProperty(FORMATTER,
SIMPLE_FMT)).newInstance();
+ Formatter fmt= (Formatter) Class.forName(System.getProperty(
+ FORMATTER, SIMPLE_FMT)).getConstructor().newInstance();
// it is also possible that the user modified
jre/lib/logging.properties -
// but that's really stupid in most cases
Logger root=Logger.getLogger("");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/BeanFactory.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/BeanFactory.java Fri
Oct 6 09:16:33 2017
@@ -145,7 +145,7 @@ public class BeanFactory
BeanInfo bi = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] pda = bi.getPropertyDescriptors();
- Object bean = beanClass.newInstance();
+ Object bean = beanClass.getConstructor().newInstance();
/* Look for properties with explicitly configured setter */
RefAddr ra = ref.get("forceString");
@@ -288,24 +288,16 @@ public class BeanFactory
NamingException ne = new NamingException(ie.getMessage());
ne.setRootCause(ie);
throw ne;
- } catch (java.lang.IllegalAccessException iae) {
- NamingException ne = new NamingException(iae.getMessage());
- ne.setRootCause(iae);
- throw ne;
- } catch (java.lang.InstantiationException ie2) {
- NamingException ne = new NamingException(ie2.getMessage());
- ne.setRootCause(ie2);
- throw ne;
- } catch (java.lang.reflect.InvocationTargetException ite) {
- Throwable cause = ite.getCause();
+ } catch (java.lang.ReflectiveOperationException e) {
+ Throwable cause = e.getCause();
if (cause instanceof ThreadDeath) {
throw (ThreadDeath) cause;
}
if (cause instanceof VirtualMachineError) {
throw (VirtualMachineError) cause;
}
- NamingException ne = new NamingException(ite.getMessage());
- ne.setRootCause(ite);
+ NamingException ne = new NamingException(e.getMessage());
+ ne.setRootCause(e);
throw ne;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/EjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/EjbFactory.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/EjbFactory.java Fri Oct
6 09:16:33 2017
@@ -44,7 +44,7 @@ public class EjbFactory extends FactoryB
"javax.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
try {
factory = (ObjectFactory)
- Class.forName(javaxEjbFactoryClassName).newInstance();
+
Class.forName(javaxEjbFactoryClassName).getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java Fri
Oct 6 09:16:33 2017
@@ -69,7 +69,7 @@ public abstract class FactoryBase implem
throw ex;
}
try {
- factory = (ObjectFactory) factoryClass.newInstance();
+ factory = (ObjectFactory)
factoryClass.getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
Fri Oct 6 09:16:33 2017
@@ -45,7 +45,7 @@ public class ResourceFactory extends Fac
Constants.DBCP_DATASOURCE_FACTORY);
try {
factory = (ObjectFactory) Class.forName(
- javaxSqlDataSourceFactoryClassName).newInstance();
+
javaxSqlDataSourceFactoryClassName).getConstructor().newInstance();
} catch (Exception e) {
NamingException ex = new NamingException(
"Could not create resource factory instance");
@@ -57,8 +57,8 @@ public class ResourceFactory extends Fac
System.getProperty("javax.mail.Session.Factory",
"org.apache.naming.factory.MailSessionFactory");
try {
- factory = (ObjectFactory)
-
Class.forName(javaxMailSessionFactoryClassName).newInstance();
+ factory = (ObjectFactory) Class.forName(
+
javaxMailSessionFactoryClassName).getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java Fri
Oct 6 09:16:33 2017
@@ -32,24 +32,24 @@ public class SimpleInstanceManager imple
@Override
public Object newInstance(Class<?> clazz) throws IllegalAccessException,
- InvocationTargetException, NamingException, InstantiationException
{
- return prepareInstance(clazz.newInstance());
+ InvocationTargetException, NamingException,
InstantiationException, NoSuchMethodException {
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
public Object newInstance(String className) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
- ClassNotFoundException {
+ ClassNotFoundException, NoSuchMethodException {
Class<?> clazz =
Thread.currentThread().getContextClassLoader().loadClass(className);
- return prepareInstance(clazz.newInstance());
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
public Object newInstance(String fqcn, ClassLoader classLoader) throws
IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
- ClassNotFoundException {
+ ClassNotFoundException, NoSuchMethodException {
Class<?> clazz = classLoader.loadClass(fqcn);
- return prepareInstance(clazz.newInstance());
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 6 09:16:33 2017
@@ -1,3 +1,3 @@
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1757164
/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1757164
-/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1743697,1757167,1772849
+/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1743697,1757167,1772849,1811203,1811220
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1811307&r1=1811306&r2=1811307&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
Fri Oct 6 09:16:33 2017
@@ -2153,7 +2153,7 @@ public class BasicDataSource implements
// Usage of DriverManager is not possible, as it does not
// respect the ContextClassLoader
// N.B. This cast may cause ClassCastException which is
handled below
- driverToUse = (Driver) driverFromCCL.newInstance();
+ driverToUse = (Driver)
driverFromCCL.getConstructor().newInstance();
if (!driverToUse.acceptsURL(url)) {
throw new SQLException("No suitable driver", "08001");
}
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 6 09:16:33 2017
@@ -1,2 +1,2 @@
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1757166
-/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:1743698,1757168
+/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:1743698,1757168,1811203,1811220
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
