Author: markt
Date: Sat Mar 7 19:50:34 2009
New Revision: 751315
URL: http://svn.apache.org/viewvc?rev=751315&view=rev
Log:
Some generics fixes
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java?rev=751315&r1=751314&r2=751315&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
Sat Mar 7 19:50:34 2009
@@ -43,7 +43,8 @@
/**
* the constructors that are used to create statement proxies
*/
- protected static final Constructor[] constructors = new
Constructor[AbstractCreateStatementInterceptor.statements.length];
+ protected static final Constructor<?>[] constructors =
+ new Constructor[AbstractCreateStatementInterceptor.statements.length];
public AbstractQueryReport() {
@@ -147,9 +148,9 @@
* @return - returns a constructor used to create new instances
* @throws NoSuchMethodException
*/
- protected Constructor getConstructor(int idx, Class clazz) throws
NoSuchMethodException {
+ protected Constructor<?> getConstructor(int idx, Class<?> clazz) throws
NoSuchMethodException {
if (constructors[idx]==null) {
- Class proxyClass =
Proxy.getProxyClass(SlowQueryReport.class.getClassLoader(), new Class[]
{clazz});
+ Class<?> proxyClass =
Proxy.getProxyClass(SlowQueryReport.class.getClassLoader(), new Class[]
{clazz});
constructors[idx] = proxyClass.getConstructor(new Class[] {
InvocationHandler.class });
}
return constructors[idx];
@@ -164,7 +165,7 @@
Object result = null;
String name = method.getName();
String sql = null;
- Constructor constructor = null;
+ Constructor<?> constructor = null;
if (compare(statements[0],name)) {
//createStatement
constructor = getConstructor(0,Statement.class);
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=751315&r1=751314&r2=751315&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Sat Mar 7 19:50:34 2009
@@ -224,7 +224,7 @@
"The date and time of the last invocation"
};
- static final OpenType[] FIELD_TYPES = new OpenType[] {
+ static final OpenType<?>[] FIELD_TYPES = new OpenType[] {
SimpleType.STRING,
SimpleType.INTEGER,
SimpleType.LONG,
@@ -258,7 +258,7 @@
return FIELD_DESCRIPTIONS;
}
- public static OpenType[] getFieldTypes() {
+ public static OpenType<?>[] getFieldTypes() {
return FIELD_TYPES;
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java?rev=751315&r1=751314&r2=751315&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Sat Mar 7 19:50:34 2009
@@ -39,7 +39,7 @@
public Object createStatement(Object proxy, Method method, Object[] args,
Object statement, long time) {
// TODO Auto-generated method stub
try {
- statements.add(new WeakReference((Statement)statement));
+ statements.add(new WeakReference<Statement>((Statement)statement));
}catch (ClassCastException x) {
//ignore this one
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
