remm        2003/08/05 02:32:15

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Revert 1.118 change, which was breaking reloading.
  - The date of the change was early april (and was integrated in 4.1.25), so
    there should have been plenty of time to fix this issue.
  - Note: In TC 5, it does not cause problems likely because the reloading logic does
    a stop/start, which is considerably simpler (but has a few minor disadvantages),
    and worked fine with 4.1.27.
  
  Revision  Changes    Path
  1.120     +5 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- StandardContext.java      29 Apr 2003 20:36:33 -0000      1.119
  +++ StandardContext.java      5 Aug 2003 09:32:14 -0000       1.120
  @@ -1059,7 +1059,7 @@
           if (context == null)
               context = new ApplicationContext(getBasePath(), this);
   
  -        return (context.getFacade());
  +        return (context);
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to