Author: fhanik
Date: Thu Mar 31 21:20:30 2011
New Revision: 1087442
URL: http://svn.apache.org/viewvc?rev=1087442&view=rev
Log:
Fix NPE that can happen during concurrency (connection being abandoned,
misconfiguration in abandon timeout or lack of ResetAbandonedTimer interceptor)
http://markmail.org/message/yhshyvyunddb5ngt
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=1087442&r1=1087441&r2=1087442&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Thu Mar 31 21:20:30 2011
@@ -122,7 +122,12 @@ public class ProxyConnection extends Jdb
return this.isWrapperFor((Class<?>)args[0]);
}
try {
- return method.invoke(connection.getConnection(),args);
+ PooledConnection poolc = connection;
+ if (poolc!=null) {
+ return method.invoke(poolc.getConnection(),args);
+ } else {
+ throw new SQLException("Connection has already been closed.");
+ }
}catch (Throwable t) {
if (t instanceof InvocationTargetException) {
InvocationTargetException it = (InvocationTargetException)t;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
