remm 01/12/04 18:38:31
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
- Fixes STM problems. Since load is synced on this, the other synced blocks
should also be synced on this. Thanks to Craig for the help fixing this.
Revision Changes Path
1.33 +6 -6
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StandardWrapper.java 2001/10/13 01:38:46 1.32
+++ StandardWrapper.java 2001/12/05 02:38:31 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.32 2001/10/13 01:38:46 remm Exp $
- * $Revision: 1.32 $
- * $Date: 2001/10/13 01:38:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.33 2001/12/05 02:38:31 remm Exp $
+ * $Revision: 1.33 $
+ * $Date: 2001/12/05 02:38:31 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.32 $ $Date: 2001/10/13 01:38:46 $
+ * @version $Revision: 1.33 $ $Date: 2001/12/05 02:38:31 $
*/
public final class StandardWrapper
@@ -630,7 +630,7 @@
}
// Lock and return this instance
- synchronized (instance) {
+ synchronized (this) {
if (allocated) {
if (debug >= 2)
log(" Waiting for allocated STM instance");
@@ -668,7 +668,7 @@
return;
// Unlock and free this instance
- synchronized (instance) {
+ synchronized (this) {
allocated = false;
instance.notify();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
