yoavs 2005/03/23 09:01:06 Modified: catalina/src/share/org/apache/catalina/realm DataSourceRealm.java Log: Separate connection commit and close in close() method, as the former can cause a SQLException leading to the latter not being calld. Revision Changes Path 1.16 +10 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java Index: DataSourceRealm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- DataSourceRealm.java 23 Feb 2005 19:27:56 -0000 1.15 +++ DataSourceRealm.java 23 Mar 2005 17:01:06 -0000 1.16 @@ -363,11 +363,17 @@ if (dbConnection == null) return; + // Commit if not auto committed + try { + if (!dbConnection.getAutoCommit()) { + dbConnection.commit(); + } + } catch (SQLException e) { + containerLog.error("Exception committing connection before closing:", e); + } + // Close this database connection, and log any errors try { - if (!dbConnection.getAutoCommit()) { - dbConnection.commit(); - } dbConnection.close(); } catch (SQLException e) { containerLog.error(sm.getString("dataSourceRealm.close"), e); // Just log it here
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]