Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Oct 6 09:16:33 2017 @@ -95,7 +95,8 @@ public class Digester extends DefaultHan for (int i = 0; i < cls.length; i++) { try { Class<?> clazz = Class.forName(className, true, cls[i]); - source = (IntrospectionUtils.PropertySource) clazz.newInstance(); + source = (IntrospectionUtils.PropertySource) + clazz.getConstructor().newInstance(); break; } catch (Throwable t) { ExceptionUtils.handleThrowable(t); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Fri Oct 6 09:16:33 2017 @@ -319,7 +319,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.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Oct 6 09:16:33 2017 @@ -714,7 +714,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.5.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Fri Oct 6 09:16:33 2017 @@ -53,7 +53,7 @@ public abstract class SSLImplementation try { Class<?> clazz = Class.forName(className); - return (SSLImplementation) clazz.newInstance(); + return (SSLImplementation) clazz.getConstructor().newInstance(); } catch (Exception e) { String msg = sm.getString("sslImplementation.cnfe", className); if (logger.isDebugEnabled()) { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Fri Oct 6 09:16:33 2017 @@ -290,7 +290,7 @@ public class JSSEUtil extends SSLUtilBas 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.5.x/trunk/java/org/apache/tomcat/websocket/Util.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Util.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Util.java Fri Oct 6 09:16:33 2017 @@ -342,8 +342,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); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Fri Oct 6 09:16:33 2017 @@ -676,9 +676,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.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Oct 6 09:16:33 2017 @@ -133,8 +133,8 @@ public class WsWebSocketContainer implem 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); } @@ -160,8 +160,8 @@ public class WsWebSocketContainer implem 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); @@ -178,8 +178,8 @@ public class WsWebSocketContainer implem 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.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Fri Oct 6 09:16:33 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.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Fri Oct 6 09:16:33 2017 @@ -216,8 +216,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(), @@ -418,8 +418,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.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java (original) +++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java Fri Oct 6 09:16:33 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.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original) +++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri Oct 6 09:16:33 2017 @@ -302,7 +302,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 @@ -415,7 +415,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) { @@ -462,7 +462,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.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original) +++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Fri Oct 6 09:16:33 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.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (original) +++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java Fri Oct 6 09:16:33 2017 @@ -273,7 +273,7 @@ public class PooledConnection { poolProperties.getDriverClassName(), PooledConnection.class.getClassLoader(), Thread.currentThread().getContextClassLoader() - ).newInstance(); + ).getConstructor().newInstance(); } } } catch (java.lang.Exception cn) { Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java Fri Oct 6 09:16:33 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.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Fri Oct 6 09:16:33 2017 @@ -307,7 +307,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.5.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java Fri Oct 6 09:16:33 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.5.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Fri Oct 6 09:16:33 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.5.x/trunk/test/org/apache/naming/resources/TesterFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TesterFactory.java?rev=1811307&r1=1811306&r2=1811307&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TesterFactory.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TesterFactory.java Fri Oct 6 09:16:33 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
