Author: markt
Date: Thu Oct 5 13:13:44 2017
New Revision: 1811205
URL: http://svn.apache.org/viewvc?rev=1811205&view=rev
Log:
Fix some more deprecation warnings when building with Java 9.
Use of Class.newInstance() in jdbc-pool
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1811205&r1=1811204&r2=1811205&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Thu Oct 5 13:13:44 2017
@@ -63,8 +63,7 @@ public class GenericNamingResourcesFacto
ClassLoaderUtil.loadClass(
type,
GenericNamingResourcesFactory.class.getClassLoader(),
- Thread.currentThread().getContextClassLoader())
- .newInstance();
+
Thread.currentThread().getContextClassLoader()).getDeclaredConstructor().newInstance();
while (refs.hasMoreElements()) {
RefAddr addr = refs.nextElement();
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1811205&r1=1811204&r2=1811205&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Oct 5 13:13:44 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().getDeclaredConstructor().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().getDeclaredConstructor().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().getDeclaredConstructor().newInstance();
interceptor.setProperties(proxies[i].getProperties());
interceptor.poolStarted(this);
}catch (Exception x) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1811205&r1=1811204&r2=1811205&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Oct 5 13:13:44 2017
@@ -773,16 +773,16 @@ public class PoolProperties implements P
PoolProperties.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
- validator = validatorClass.newInstance();
+ validator = validatorClass.getDeclaredConstructor().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/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1811205&r1=1811204&r2=1811205&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Thu Oct 5 13:13:44 2017
@@ -273,7 +273,7 @@ public class PooledConnection {
poolProperties.getDriverClassName(),
PooledConnection.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
- ).newInstance();
+ ).getDeclaredConstructor().newInstance();
}
}
} catch (java.lang.Exception cn) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
