You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/03/29 22:31:20 UTC
svn commit: r1307096 - in
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool:
PoolExhaustedException.java PoolProperties.java
interceptor/ConnectionState.java
interceptor/StatementDecoratorInterceptor.java
Author: markt
Date: Thu Mar 29 20:31:19 2012
New Revision: 1307096
URL: http://svn.apache.org/viewvc?rev=1307096&view=rev
Log:
Fix a handful of Eclipse warnings
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.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/interceptor/ConnectionState.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java?rev=1307096&r1=1307095&r2=1307096&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java Thu Mar 29 20:31:19 2012
@@ -20,6 +20,8 @@ import java.sql.SQLException;
public class PoolExhaustedException extends SQLException {
+ private static final long serialVersionUID = 3501536931777262475L;
+
public PoolExhaustedException() {
}
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=1307096&r1=1307095&r2=1307096&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 Mar 29 20:31:19 2012
@@ -35,6 +35,8 @@ import org.apache.juli.logging.LogFactor
*
*/
public class PoolProperties implements PoolConfiguration, Cloneable, Serializable {
+
+ private static final long serialVersionUID = -8519283440854213745L;
private static final Log log = LogFactory.getLog(PoolProperties.class);
public static final int DEFAULT_MAX_ACTIVE = 100;
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java?rev=1307096&r1=1307095&r2=1307096&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java Thu Mar 29 20:31:19 2012
@@ -131,7 +131,7 @@ public class ConnectionState extends Jdb
case 1:{result = transactionIsolation; break;}
case 2:{result = readOnly; break;}
case 3:{result = catalog; break;}
- default: result = null;
+ default: // NOOP
}
//return cached result, if we have it
if (result!=null) return result;
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java?rev=1307096&r1=1307095&r2=1307096&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java Thu Mar 29 20:31:19 2012
@@ -160,7 +160,7 @@ public class StatementDecoratorIntercept
private Object actualProxy;
private Object connection;
private String sql;
- private Constructor constructor;
+ private Constructor<?> constructor;
public StatementProxy(T delegate, String sql) {
this.delegate = delegate;
@@ -189,10 +189,10 @@ public class StatementDecoratorIntercept
}
- public Constructor getConstructor() {
+ public Constructor<?> getConstructor() {
return constructor;
}
- public void setConstructor(Constructor constructor) {
+ public void setConstructor(Constructor<?> constructor) {
this.constructor = constructor;
}
public void closeInvoked() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org