Modified: tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java Fri Oct 6 09:37:16 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.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java Fri Oct 6 09:37:16 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.0.x/trunk/java/org/apache/naming/factory/FactoryBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/FactoryBase.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/FactoryBase.java Fri Oct 6 09:37:16 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.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java Fri Oct 6 09:37:16 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.0.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/SimpleInstanceManager.java Fri Oct 6 09:37:16 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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 6 09:37:16 2017 @@ -1,3 +1,3 @@ /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605,1725731-1757164 /commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1757164 -/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006,1743697,1757167,1772849 +/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006,1743697,1757167,1772849,1811203,1811220 Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Fri Oct 6 09:37:16 2017 @@ -2146,7 +2146,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.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 6 09:37:16 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:1643814-1743698,1757168 +/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:1643814-1743698,1757168,1811203,1811220 Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java Fri Oct 6 09:37:16 2017 @@ -605,7 +605,7 @@ public abstract class BaseGenericObjectP } catch (final ClassNotFoundException e) { clazz = Class.forName(evictionPolicyClassName); } - final Object policy = clazz.newInstance(); + final Object policy = clazz.getConstructor().newInstance(); if (policy instanceof EvictionPolicy<?>) { @SuppressWarnings("unchecked") // safe, because we just checked the class final @@ -616,11 +616,7 @@ public abstract class BaseGenericObjectP throw new IllegalArgumentException( "Unable to create EvictionPolicy instance of type " + evictionPolicyClassName, e); - } catch (final InstantiationException e) { - throw new IllegalArgumentException( - "Unable to create EvictionPolicy instance of type " + - evictionPolicyClassName, e); - } catch (final IllegalAccessException e) { + } catch (final ReflectiveOperationException e) { throw new IllegalArgumentException( "Unable to create EvictionPolicy instance of type " + evictionPolicyClassName, e); Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Oct 6 09:37:16 2017 @@ -89,7 +89,8 @@ public class Digester extends DefaultHan for (int i = 0; i < cls.length; i++) { try { Class<?> clazz = Class.forName(className, true, cls[i]); - propertySource = (IntrospectionUtils.PropertySource) clazz.newInstance(); + propertySource = (IntrospectionUtils.PropertySource) + clazz.getConstructor().newInstance(); break; } catch (Throwable t) { ExceptionUtils.handleThrowable(t); Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Fri Oct 6 09:37:16 2017 @@ -114,7 +114,7 @@ public class ObjectCreateRule extends Ru // Instantiate the new object and push it on the context stack Class<?> clazz = digester.getClassLoader().loadClass(realClassName); - Object instance = clazz.newInstance(); + Object instance = clazz.getConstructor().newInstance(); digester.push(instance); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Fri Oct 6 09:37:16 2017 @@ -315,7 +315,7 @@ public class ManagedBean implements java } try { // Stupid - this will set the default minfo first.... - mbean = (BaseModelMBean) clazz.newInstance(); + mbean = (BaseModelMBean) clazz.getConstructor().newInstance(); } catch (RuntimeOperationsException e) { throw e; } catch (Exception e) { Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Oct 6 09:37:16 2017 @@ -706,7 +706,7 @@ public class Registry implements Registr } Class<?> c = Class.forName(type); - ModelerSource ds=(ModelerSource)c.newInstance(); + ModelerSource ds=(ModelerSource)c.getConstructor().newInstance(); return ds; } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Fri Oct 6 09:37:16 2017 @@ -66,7 +66,7 @@ public abstract class SSLImplementation return new org.apache.tomcat.util.net.jsse.JSSEImplementation(); } Class<?> clazz = Class.forName(className); - return (SSLImplementation) clazz.newInstance(); + return (SSLImplementation) clazz.getConstructor().newInstance(); } catch (Exception e) { if (logger.isDebugEnabled()) logger Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Fri Oct 6 09:37:16 2017 @@ -646,7 +646,7 @@ public class JSSESocketFactory implement throw new InstantiationException(sm.getString( "jsse.invalidTrustManagerClassName", className)); } - Object trustManagerObject = clazz.newInstance(); + Object trustManagerObject = clazz.getConstructor().newInstance(); TrustManager trustManager = (TrustManager) trustManagerObject; return new TrustManager[]{ trustManager }; } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java Fri Oct 6 09:37:16 2017 @@ -343,8 +343,8 @@ public class Util { @SuppressWarnings("unused") Decoder instance; try { - instance = decoderClazz.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + instance = decoderClazz.getConstructor().newInstance(); + } catch (ReflectiveOperationException e) { throw new DeploymentException( sm.getString("pojoMethodMapping.invalidDecoder", decoderClazz.getName()), e); Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 6 09:37:16 2017 @@ -1 +1 @@ -/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644 793,1644815,1644884,1644886,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1 657589,1657592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,166649 6,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1672628,1694058,1695706 +/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644 793,1644815,1644884,1644886,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1 657589,1657592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,166649 6,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1672628,1694058,1695706,1811203,1811220 Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Fri Oct 6 09:37:16 2017 @@ -633,9 +633,9 @@ public abstract class WsRemoteEndpointIm endpointConfig.getEncoders()) { Encoder instance; try { - instance = encoderClazz.newInstance(); + instance = encoderClazz.getConstructor().newInstance(); instance.init(endpointConfig); - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { throw new DeploymentException( sm.getString("wsRemoteEndpoint.invalidEncoder", encoderClazz.getName()), e); Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Oct 6 09:37:16 2017 @@ -163,8 +163,8 @@ public class WsWebSocketContainer if (!ClientEndpointConfig.Configurator.class.equals( configuratorClazz)) { try { - configurator = configuratorClazz.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + configurator = configuratorClazz.getConstructor().newInstance(); + } catch (ReflectiveOperationException e) { throw new DeploymentException(sm.getString( "wsWebSocketContainer.defaultConfiguratorFail"), e); } @@ -190,8 +190,8 @@ public class WsWebSocketContainer Object pojo; try { - pojo = annotatedEndpointClass.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + pojo = annotatedEndpointClass.getConstructor().newInstance(); + } catch (ReflectiveOperationException e) { throw new DeploymentException(sm.getString( "wsWebSocketContainer.endpointCreateFail", annotatedEndpointClass.getName()), e); @@ -208,8 +208,8 @@ public class WsWebSocketContainer Endpoint endpoint; try { - endpoint = clazz.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + endpoint = clazz.getConstructor().newInstance(); + } catch (ReflectiveOperationException e) { throw new DeploymentException(sm.getString( "wsWebSocketContainer.endpointCreateFail", clazz.getName()), e); Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java Fri Oct 6 09:37:16 2017 @@ -66,14 +66,13 @@ public class PojoMessageHandlerWholeBina if (decoderClazzes != null) { for (Class<? extends Decoder> decoderClazz : decoderClazzes) { if (Binary.class.isAssignableFrom(decoderClazz)) { - Binary<?> decoder = - (Binary<?>) decoderClazz.newInstance(); + Binary<?> decoder = (Binary<?>) decoderClazz.getConstructor().newInstance(); decoder.init(config); decoders.add(decoder); } else if (BinaryStream.class.isAssignableFrom( decoderClazz)) { - BinaryStream<?> decoder = - (BinaryStream<?>) decoderClazz.newInstance(); + BinaryStream<?> decoder = (BinaryStream<?>) + decoderClazz.getConstructor().newInstance(); decoder.init(config); decoders.add(decoder); } else { @@ -81,7 +80,7 @@ public class PojoMessageHandlerWholeBina } } } - } catch (IllegalAccessException | InstantiationException e) { + } catch (ReflectiveOperationException e) { throw new IllegalArgumentException(e); } this.isForInputStream = isForInputStream; Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java Fri Oct 6 09:37:16 2017 @@ -75,13 +75,13 @@ public class PojoMessageHandlerWholeText if (decoderClazzes != null) { for (Class<? extends Decoder> decoderClazz : decoderClazzes) { if (Text.class.isAssignableFrom(decoderClazz)) { - Text<?> decoder = (Text<?>) decoderClazz.newInstance(); + Text<?> decoder = (Text<?>) decoderClazz.getConstructor().newInstance(); decoder.init(config); decoders.add(decoder); } else if (TextStream.class.isAssignableFrom( decoderClazz)) { TextStream<?> decoder = - (TextStream<?>) decoderClazz.newInstance(); + (TextStream<?>) decoderClazz.getConstructor().newInstance(); decoder.init(config); decoders.add(decoder); } else { @@ -89,7 +89,7 @@ public class PojoMessageHandlerWholeText } } } - } catch (IllegalAccessException | InstantiationException e) { + } catch (ReflectiveOperationException e) { throw new IllegalArgumentException(e); } } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java Fri Oct 6 09:37:16 2017 @@ -33,8 +33,10 @@ public class DefaultServerEndpointConfig public <T> T getEndpointInstance(Class<T> clazz) throws InstantiationException { try { - return clazz.newInstance(); - } catch (IllegalAccessException e) { + return clazz.getConstructor().newInstance(); + } catch (InstantiationException e) { + throw e; + } catch (ReflectiveOperationException e) { InstantiationException ie = new InstantiationException(); ie.initCause(e); throw ie; Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Fri Oct 6 09:37:16 2017 @@ -72,7 +72,7 @@ public class WsSci implements ServletCon } if (ServerApplicationConfig.class.isAssignableFrom(clazz)) { serverApplicationConfigs.add( - (ServerApplicationConfig) clazz.newInstance()); + (ServerApplicationConfig) clazz.getConstructor().newInstance()); } if (Endpoint.class.isAssignableFrom(clazz)) { @SuppressWarnings("unchecked") @@ -84,7 +84,7 @@ public class WsSci implements ServletCon scannedPojoEndpoints.add(clazz); } } - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { throw new ServletException(e); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Fri Oct 6 09:37:16 2017 @@ -261,8 +261,8 @@ public class WsServerContainer extends W Configurator configurator = null; if (!configuratorClazz.equals(Configurator.class)) { try { - configurator = annotation.configurator().newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + configurator = annotation.configurator().getConstructor().newInstance(); + } catch (ReflectiveOperationException e) { throw new DeploymentException(sm.getString( "serverContainer.configuratorFail", annotation.configurator().getName(), @@ -524,8 +524,8 @@ public class WsServerContainer extends W @SuppressWarnings("unused") Encoder instance; try { - encoder.newInstance(); - } catch(InstantiationException | IllegalAccessException e) { + encoder.getConstructor().newInstance(); + } catch(ReflectiveOperationException e) { throw new DeploymentException(sm.getString( "serverContainer.encoderFail", encoder.getName()), e); } Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java Fri Oct 6 09:37:16 2017 @@ -63,8 +63,7 @@ public class GenericNamingResourcesFacto ClassLoaderUtil.loadClass( type, GenericNamingResourcesFactory.class.getClassLoader(), - Thread.currentThread().getContextClassLoader()) - .newInstance(); + Thread.currentThread().getContextClassLoader()).getConstructor().newInstance(); while (refs.hasMoreElements()) { RefAddr addr = refs.nextElement(); Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri Oct 6 09:37:16 2017 @@ -301,7 +301,7 @@ public class ConnectionPool { for (int i=proxies.length-1; i>=0; i--) { try { //create a new instance - JdbcInterceptor interceptor = proxies[i].getInterceptorClass().newInstance(); + JdbcInterceptor interceptor = proxies[i].getInterceptorClass().getConstructor().newInstance(); //configure properties interceptor.setProperties(proxies[i].getProperties()); //setup the chain @@ -413,7 +413,7 @@ public class ConnectionPool { PoolProperties.InterceptorDefinition[] proxies = getPoolProperties().getJdbcInterceptorsAsArray(); for (int i=0; i<proxies.length; i++) { try { - JdbcInterceptor interceptor = proxies[i].getInterceptorClass().newInstance(); + JdbcInterceptor interceptor = proxies[i].getInterceptorClass().getConstructor().newInstance(); interceptor.setProperties(proxies[i].getProperties()); interceptor.poolClosed(this); }catch (Exception x) { @@ -460,7 +460,7 @@ public class ConnectionPool { if (log.isDebugEnabled()) { log.debug("Creating interceptor instance of class:"+proxies[i].getInterceptorClass()); } - JdbcInterceptor interceptor = proxies[i].getInterceptorClass().newInstance(); + JdbcInterceptor interceptor = proxies[i].getInterceptorClass().getConstructor().newInstance(); interceptor.setProperties(proxies[i].getProperties()); interceptor.poolStarted(this); }catch (Exception x) { Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Fri Oct 6 09:37:16 2017 @@ -773,16 +773,16 @@ public class PoolProperties implements P PoolProperties.class.getClassLoader(), Thread.currentThread().getContextClassLoader() ); - validator = validatorClass.newInstance(); + validator = validatorClass.getConstructor().newInstance(); } catch (ClassNotFoundException e) { log.warn("The class "+className+" cannot be found.", e); } catch (ClassCastException e) { log.warn("The class "+className+" does not implement the Validator interface.", e); - } catch (InstantiationException e) { - log.warn("An object of class "+className+" cannot be instantiated. Make sure that "+ - "it includes an implicit or explicit no-arg constructor.", e); } catch (IllegalAccessException e) { log.warn("The class "+className+" or its no-arg constructor are inaccessible.", e); + } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) { + log.warn("An object of class "+className+" cannot be instantiated. Make sure that "+ + "it includes an implicit or explicit no-arg constructor.", e); } } Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java Fri Oct 6 09:37:16 2017 @@ -270,7 +270,7 @@ public class PooledConnection { poolProperties.getDriverClassName(), PooledConnection.class.getClassLoader(), Thread.currentThread().getContextClassLoader() - ).newInstance(); + ).getConstructor().newInstance(); } } } catch (java.lang.Exception cn) { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java Fri Oct 6 09:37:16 2017 @@ -196,7 +196,7 @@ public class TestWebappClassLoaderThread "org.apache.tomcat.unittest." + name, classBytes, 0, offset, cl.getClass().getProtectionDomain()); // Make sure we can create an instance - Object obj = lpClass.newInstance(); + Object obj = lpClass.getConstructor().newInstance(); obj.toString(); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Fri Oct 6 09:37:16 2017 @@ -310,7 +310,7 @@ public class TestWebappClassLoaderWeavin Method m = c.getMethod("doMethod"); - Object o = c.newInstance(); + Object o = c.getConstructor().newInstance(); return (String) m.invoke(o); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java Fri Oct 6 09:37:16 2017 @@ -172,7 +172,7 @@ public class TestWebappServiceLoader { try { loader.loadServices(ServletContainerInitializer.class, names); } catch (IOException e) { - Assert.assertTrue(e.getCause() instanceof InstantiationException); + Assert.assertTrue(e.getCause() instanceof ReflectiveOperationException); } finally { control.verify(); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Fri Oct 6 09:37:16 2017 @@ -171,7 +171,7 @@ public class ChannelCreator { System.out.println("Creating receiver class="+receiver); Class<?> cl = Class.forName(receiver, true, ChannelCreator.class.getClassLoader()); - ReceiverBase rx = (ReceiverBase)cl.newInstance(); + ReceiverBase rx = (ReceiverBase)cl.getConstructor().newInstance(); rx.setAddress(bind); rx.setPort(port); rx.setSelectorTimeout(tcpseltimeout); @@ -185,7 +185,8 @@ public class ChannelCreator { ReplicationTransmitter ps = new ReplicationTransmitter(); System.out.println("Creating transport class="+transport); - MultiPointSender sender = (MultiPointSender)Class.forName(transport,true,ChannelCreator.class.getClassLoader()).newInstance(); + MultiPointSender sender = (MultiPointSender)Class.forName( + transport,true,ChannelCreator.class.getClassLoader()).getConstructor().newInstance(); sender.setTimeout(acktimeout); sender.setMaxRetryAttempts(2); sender.setRxBufSize(43800); Modified: tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TesterFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TesterFactory.java?rev=1811309&r1=1811308&r2=1811309&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TesterFactory.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TesterFactory.java Fri Oct 6 09:37:16 2017 @@ -41,7 +41,7 @@ public class TesterFactory implements Ob ClassLoader cl = Thread.currentThread().getContextClassLoader(); Class<?> clazz = cl.loadClass("org.apache.naming.resources.TesterObject"); - return clazz.newInstance(); + return clazz.getConstructor().newInstance(); } } return null; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
