Author: markt
Date: Sun Nov 19 15:52:52 2006
New Revision: 476979
URL: http://svn.apache.org/viewvc?view=rev&rev=476979
Log:
Port fix for bug 40844. Missing syncs.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?view=diff&rev=476979&r1=476978&r2=476979
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Nov
19 15:52:52 2006
@@ -39,7 +39,8 @@
* for configuration options.
*
* <p><strong>TODO</strong> - Support connection pooling (including message
-* format objects) so that <code>authenticate()</code> does not have to be
+* format objects) so that <code>authenticate()</code>,
+* <code>getPassword()</code> and <code>authenticate()</code> do not have to be
* synchronized and would fix the ugly connection logic. </p>
*
* @author Craig R. McClanahan
@@ -520,7 +521,7 @@
/**
* Return the password associated with the given principal's user name.
*/
- protected String getPassword(String username) {
+ protected synchronized String getPassword(String username) {
// Look up the user's credentials
String dbCredentials = null;
@@ -725,7 +726,8 @@
*
* @exception SQLException if a database error occurs
*/
- protected PreparedStatement roles(Connection dbConnection, String username)
+ protected synchronized PreparedStatement roles(Connection dbConnection,
+ String username)
throws SQLException {
if (preparedRoles == null) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=476979&r1=476978&r2=476979
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 19 15:52:52 2006
@@ -14,6 +14,23 @@
</properties>
<body>
+<section name="Tomcat 6.0.3 (remm)">
+ <subsection name="General">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>40844</bug> Missing syncs in JDBCRealm. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 6.0.2 (remm)">
<subsection name="General">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
