From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Jul 2009 01:45:18 +0000 (+0000)
Subject: During a release, arguments are null
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d4561c774a056f1603879e7487352092c5a55c78;p=tomcat7.0

During a release, arguments are null


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

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index c097e5484..725614380 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -53,6 +53,7 @@ public class ConnectionState extends JdbcInterceptor  {
     
     
     public void reset(ConnectionPool parent, PooledConnection con) {
+        if (parent==null || con==null) return;
         PoolConfiguration poolProperties = parent.getPoolProperties();
         if (poolProperties.getDefaultReadOnly()!=null) {
             try {