Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577

A handful of generics fixes.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@799416 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 784794e..2ca9eb5 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -168,7 +168,7 @@ public class DataSourceFactory implements ObjectFactory {
      * @exception Exception if an exception occurs creating the instance
      */
     public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-                                    Hashtable environment) throws Exception {
+                                    Hashtable<?,?> environment) throws Exception {
 
         // We only know how to deal with <code>javax.naming.Reference</code>s
         // that specify a class name of "javax.sql.DataSource"

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index 1d32d1f..d55e766 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -733,7 +733,7 @@ public class PoolProperties implements PoolConfiguration {
     public static class InterceptorDefinition {
         protected String className;
         protected Map<String,InterceptorProperty> properties = new HashMap<String,InterceptorProperty>();
-        protected volatile Class clazz = null;
+        protected volatile Class<?> clazz = null;
         public InterceptorDefinition(String className) {
             this.className = className;
         }

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
index 2718a54..5005ede 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
@@ -265,7 +265,7 @@ public class SlowQueryReportJmx extends SlowQueryReport implements NotificationE
     }
 
 
-    public static ObjectName getObjectName(Class clazz, String poolName) throws MalformedObjectNameException {
+    public static ObjectName getObjectName(Class<?> clazz, String poolName) throws MalformedObjectNameException {
         ObjectName oname = new ObjectName(ConnectionPool.POOL_JMX_TYPE_PREFIX+clazz.getName()+",name=" + poolName);
         return oname;
     }