This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 39dc17a Generics: Remaining low hanging fruit
39dc17a is described below
commit 39dc17a811ddbac92d74f784ade64052769595a3
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 22 11:55:05 2019 +0000
Generics: Remaining low hanging fruit
---
java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../apache/tomcat/dbcp/dbcp/cpdsadapter/PooledConnectionImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java
index d332bc5..24d1d2c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/DriverAdapterCPDS.java
@@ -278,7 +278,7 @@ public class DriverAdapterCPDS
*/
@Override
public Object getObjectInstance(Object refObj, Name name,
- Context context, Hashtable env)
+ Context context, Hashtable<?, ?> env)
throws Exception {
// The spec says to return null if we can't create an instance
// of the reference
diff --git
a/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/PooledConnectionImpl.java
b/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/PooledConnectionImpl.java
index 8dfcc5b..03d9a91 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/PooledConnectionImpl.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/cpdsadapter/PooledConnectionImpl.java
@@ -62,12 +62,12 @@ class PooledConnectionImpl
/**
* ConnectionEventListeners
*/
- private final Vector eventListeners;
+ private final Vector<ConnectionEventListener> eventListeners;
/**
* StatementEventListeners
*/
- private final Vector statementEventListeners = new Vector();
+ private final Vector<StatementEventListener> statementEventListeners = new
Vector<StatementEventListener>();
/**
* flag set to true, once close() is called.
@@ -95,7 +95,7 @@ class PooledConnectionImpl
} else {
this.delegatingConnection = new DelegatingConnection(connection);
}
- eventListeners = new Vector();
+ eventListeners = new Vector<ConnectionEventListener>();
isClosed = false;
if (pool != null) {
pstmtPool = pool;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
