svn commit: r1437194 - in /manifoldcf/branches/release-1.1-branch: ./ connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java

[kwright]

Author: kwright
Date: Tue Jan 22 21:45:31 2013
New Revision: 1437194

URL: http://svn.apache.org/viewvc?rev=1437194&view=rev
Log:
Missed part of CONNECTORS-620.

Modified:
    manifoldcf/branches/release-1.1-branch/   (props changed)
    
manifoldcf/branches/release-1.1-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java

Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1437192

Modified: 
manifoldcf/branches/release-1.1-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java?rev=1437194&r1=1437193&r2=1437194&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.1-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
 (original)
+++ 
manifoldcf/branches/release-1.1-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
 Tue Jan 22 21:45:31 2013
@@ -131,13 +131,9 @@ public class JDBCAuthority extends BaseA
   public void disconnect()
     throws ManifoldCFException {
     if (connection != null) {
-      try {
-        JDBCConnectionFactory.releaseConnection(connection);
-      } catch (ServiceInterruption ex) {
-        //ignore errors as we want to close the connection anyway...
-      }
+      JDBCConnectionFactory.releaseConnection(connection);
+      connection = null;
     }
-    connection = null;
     host = null;
     jdbcProvider = null;
     databaseName = null;