You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/12/09 23:03:11 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core LocalStrings.properties StandardHost.java

remm        01/12/09 14:03:11

  Modified:    catalina/src/share/org/apache/catalina/core
                        LocalStrings.properties StandardHost.java
  Log:
  - Allow disabling the error report valve by setting the attribute to an empty string.
  - Also remove the FIXME related to the error reporting.
  
  Revision  Changes    Path
  1.44      +1 -0      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- LocalStrings.properties	2001/12/01 04:14:04	1.43
  +++ LocalStrings.properties	2001/12/09 22:03:11	1.44
  @@ -93,6 +93,7 @@
   standardHost.installing=Installing web application at context path {0} from URL {1}
   standardHost.installingWAR=Installing web application from URL {0}
   standardHost.installError=Error deploying application at context path {0}
  +standardHost.invalidErrorReportValveClass=Couldn't load specified error report valve class: {0}
   standardHost.docBase=Document base directory {0} already exists
   standardHost.mappingError=MAPPING configuration error for request URI {0}
   standardHost.noContext=No Context configured to process this request
  
  
  
  1.23      +9 -7      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
  
  Index: StandardHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- StandardHost.java	2001/10/25 00:23:02	1.22
  +++ StandardHost.java	2001/12/09 22:03:11	1.23
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v 1.22 2001/10/25 00:23:02 craigmcc Exp $
  - * $Revision: 1.22 $
  - * $Date: 2001/10/25 00:23:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v 1.23 2001/12/09 22:03:11 remm Exp $
  + * $Revision: 1.23 $
  + * $Date: 2001/12/09 22:03:11 $
    *
    * ====================================================================
    *
  @@ -95,7 +95,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.22 $ $Date: 2001/10/25 00:23:02 $
  + * @version $Revision: 1.23 $ $Date: 2001/12/09 22:03:11 $
    */
   
   public class StandardHost
  @@ -627,14 +627,16 @@
       public synchronized void start() throws LifecycleException {
   
           // Set error report valve
  -        if (errorReportValveClass != null) {
  +        if ((errorReportValveClass != null)
  +            && (!errorReportValveClass.equals(""))) {
               try {
                   Valve valve = (Valve) Class.forName(errorReportValveClass)
                       .newInstance();
                   addValve(valve);
               } catch (Throwable t) {
  -                // FIXME
  -                t.printStackTrace();
  +                log(sm.getString
  +                    ("standardHost.invalidErrorReportValveClass", 
  +                     errorReportValveClass));
               }
           }
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>