tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r714036 - in /tomcat/trunk/modules/jdbc-pool: build.xml java/org/apache/tomcat/jdbc/pool/PooledConnection.java sign.sh
Date Fri, 14 Nov 2008 15:33:40 GMT
Author: fhanik
Date: Fri Nov 14 07:33:39 2008
New Revision: 714036

URL: http://svn.apache.org/viewvc?rev=714036&view=rev
Log:
A disconnect should not throw an error

Modified:
    tomcat/trunk/modules/jdbc-pool/build.xml
    tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
    tomcat/trunk/modules/jdbc-pool/sign.sh

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=714036&r1=714035&r2=714036&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Nov 14 07:33:39 2008
@@ -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 -->

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=714036&r1=714035&r2=714036&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Fri Nov 14 07:33:39 2008
@@ -94,13 +94,19 @@
         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 boolean abandon() {
         try {
             disconnect(true);
-        } catch (SQLException x) {
+        } catch (Exception x) {
             log.error("", x);
         } //catch
         return false;
@@ -207,10 +213,6 @@
     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);

Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=714036&r1=714035&r2=714036&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Fri Nov 14 07:33:39 2008
@@ -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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message