svn commit: r964457 - in /mina/ftpserver: branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java

[ngn]

Author: ngn
Date: Thu Jul 15 15:10:08 2010
New Revision: 964457

URL: http://svn.apache.org/viewvc?rev=964457&view=rev
Log:
Correctly closing DB connection used for first verifying the connection 
(FTPSERVER-379)

Modified:
    
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
    
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java

Modified: 
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
URL: 
http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java?rev=964457&r1=964456&r2=964457&view=diff
==============================================================================
--- 
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
 (original)
+++ 
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
 Thu Jul 15 15:10:08 2010
@@ -92,15 +92,18 @@ public class DbUserManager extends Abstr
         this.authenticateStmt = authenticateStmt;
         this.isAdminStmt = isAdminStmt;
 
-        try {
-            // test the connection
-            createConnection();
-
-            LOG.info("Database connection opened.");
-        } catch (SQLException ex) {
-            LOG.error("Failed to open connection to user database", ex);
-            throw new FtpServerConfigurationException(
-                    "Failed to open connection to user database", ex);
+        Connection con = null; 
+        try { 
+                // test the connection 
+                con = createConnection(); 
+                
+                LOG.info("Database connection opened."); 
+        } catch (SQLException ex) { 
+                LOG.error("Failed to open connection to user database", ex); 
+                throw new FtpServerConfigurationException( 
+                "Failed to open connection to user database", ex); 
+        } finally{ 
+                closeQuitely(con); 
         }
     }
 

Modified: 
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
URL: 
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java?rev=964457&r1=964456&r2=964457&view=diff
==============================================================================
--- 
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
 (original)
+++ 
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
 Thu Jul 15 15:10:08 2010
@@ -92,15 +92,18 @@ public class DbUserManager extends Abstr
         this.authenticateStmt = authenticateStmt;
         this.isAdminStmt = isAdminStmt;
 
-        try {
-            // test the connection
-            createConnection();
-
-            LOG.info("Database connection opened.");
-        } catch (SQLException ex) {
-            LOG.error("Failed to open connection to user database", ex);
-            throw new FtpServerConfigurationException(
-                    "Failed to open connection to user database", ex);
+        Connection con = null; 
+        try { 
+                // test the connection 
+                con = createConnection(); 
+                
+                LOG.info("Database connection opened."); 
+        } catch (SQLException ex) { 
+                LOG.error("Failed to open connection to user database", ex); 
+                throw new FtpServerConfigurationException( 
+                "Failed to open connection to user database", ex); 
+        } finally{ 
+                closeQuitely(con); 
         }
     }