remm 01/12/11 00:29:38
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardWrapper.java
Log:
- The patch on the STM bug was completely broken (I just found that out by
accident). This should fix the issue for real. Sorry for the trouble.
Revision Changes Path
No revision
No revision
1.29.2.6 +7 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.29.2.5
retrieving revision 1.29.2.6
diff -u -r1.29.2.5 -r1.29.2.6
--- StandardWrapper.java 2001/12/05 02:57:58 1.29.2.5
+++ StandardWrapper.java 2001/12/11 08:29:38 1.29.2.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.29.2.5 2001/12/05 02:57:58 remm Exp $
- * $Revision: 1.29.2.5 $
- * $Date: 2001/12/05 02:57:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.29.2.6 2001/12/11 08:29:38 remm Exp $
+ * $Revision: 1.29.2.6 $
+ * $Date: 2001/12/11 08:29:38 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.29.2.5 $ $Date: 2001/12/05 02:57:58 $
+ * @version $Revision: 1.29.2.6 $ $Date: 2001/12/11 08:29:38 $
*/
public final class StandardWrapper
@@ -630,8 +630,8 @@
}
// Lock and return this instance
- synchronized (this) {
- if (allocated) {
+ synchronized (instance) {
+ while (allocated) {
if (debug >= 2)
log(" Waiting for allocated STM instance");
try {
@@ -668,7 +668,7 @@
return;
// Unlock and free this instance
- synchronized (this) {
+ synchronized (instance) {
allocated = false;
instance.notify();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
