tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapper.java
Date Wed, 05 Dec 2001 02:57:58 GMT
remm        01/12/04 18:57:58

  Modified:    catalina/src/share/org/apache/catalina/core Tag:
                        tomcat_40_branch StandardWrapper.java
  Log:
  - Port fix for STM.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.5  +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.29.2.4
  retrieving revision 1.29.2.5
  diff -u -r1.29.2.4 -r1.29.2.5
  --- StandardWrapper.java	2001/10/13 00:42:29	1.29.2.4
  +++ StandardWrapper.java	2001/12/05 02:57:58	1.29.2.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.29.2.4 2001/10/13 00:42:29 remm Exp $
  - * $Revision: 1.29.2.4 $
  - * $Date: 2001/10/13 00:42:29 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -105,7 +105,7 @@
    * make them efficient are counter-productive.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.29.2.4 $ $Date: 2001/10/13 00:42:29 $
  + * @version $Revision: 1.29.2.5 $ $Date: 2001/12/05 02:57:58 $
    */
   
   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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message