A disconnect should not throw an error

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

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 9366543..d1ee23a 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -25,7 +25,7 @@
   <property name="version.minor"         value="0" />
   <property name="version.build"         value="3" />
   <property name="version.patch"         value="-beta" />
-  <property name="version"               value="${version.major}.${version.minor}.${version.build}${version.patch}" />
+  <property name="version"               value="${version.major}.${version.minor}.${version.build} ${version.patch}" />
   <!-- property values you must customize for successful building!!!        -->
   <property file="${user.home}/build.properties"/>
   <property file="${basedir}/modules/jdbc-pool/build.properties"/>
@@ -182,7 +182,8 @@
     </tar>
     <gzip src="${destdir}/apache-tomcat-jdbc-${version}.tar"
              destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
-       <delete file="${destdir}/apache-tomcat-jdbc-${version}.tar"/>
+    <delete file="${destdir}/apache-tomcat-jdbc-${version}.tar"/>
+    <echo message="Options +Indexes" file="${destdir}/.htaccess"/>
   </target>
        
   <!-- Download and dependency building -->

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
index 3654bf2..a506f52 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
@@ -94,13 +94,19 @@ public class PooledConnection {
         this.connect();
     } //reconnect
 
-    protected synchronized void disconnect(boolean finalize) throws SQLException {
+    protected synchronized void disconnect(boolean finalize) {
         if (isDiscarded()) {
             return;
         }
         setDiscarded(true);
         if (connection != null) {
-            connection.close();
+            try {
+                connection.close();
+            }catch (Exception ignore) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Unable to close underlying SQL connection",ignore);
+                }
+            }
         }
         connection = null;
         if (finalize) parent.finalize(this);
@@ -122,7 +128,7 @@ public class PooledConnection {
     public boolean abandon() {
         try {
             disconnect(true);
-        } catch (SQLException x) {
+        } catch (Exception x) {
             log.error("", x);
         } //catch
         return false;
@@ -207,10 +213,6 @@ public class PooledConnection {
     public void release() {
         try {
             disconnect(true);
-        } catch (SQLException x) {
-            if (log.isDebugEnabled()) {
-                log.debug("Unable to close SQL connection",x);
-            }
         } catch (Exception x) {
             if (log.isDebugEnabled()) {
                 log.debug("Unable to close SQL connection",x);

diff --git a/modules/jdbc-pool/sign.sh b/modules/jdbc-pool/sign.sh
index 868b29a..42475d9 100755 (executable)
--- a/modules/jdbc-pool/sign.sh
+++ b/modules/jdbc-pool/sign.sh
@@ -1,4 +1,4 @@
-VERSION=v1.0.2-beta
+VERSION=v1.0.3-beta
 for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
   echo Signing $i
   echo $1|gpg --passphrase-fd 0 -a -b $i