Author: markt
Date: Thu Aug 1 10:17:46 2013
New Revision: 1509160
URL: http://svn.apache.org/r1509160
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55333
Correct regression in fix for bug 55071.
Don't commit the connection until after the ResultSet has been used.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1509156
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1509160&r1=1509159&r2=1509160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Aug
1 10:17:46 2013
@@ -553,12 +553,12 @@ public class JDBCRealm
stmt = credentials(dbConnection, username);
rs = stmt.executeQuery();
- dbConnection.commit();
-
if (rs.next()) {
dbCredentials = rs.getString(1);
}
+ dbConnection.commit();
+
if (dbCredentials != null) {
dbCredentials = dbCredentials.trim();
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1509160&r1=1509159&r2=1509160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 1 10:17:46 2013
@@ -97,6 +97,10 @@
<code>AsyncListener.onTimeout()</code> should not trigger an
<code>IllegalStateException</code>. (markt)
</fix>
+ <fix>
+ <bug>55333</bug>: Correct a regression in the fix for <bug>55071</bug>.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
