tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarc...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Wed, 05 Mar 2003 05:01:07 GMT
jfarcand    2003/03/04 21:01:07

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  When Tomcat is embedded, there are situations where appBase could be equals to null. In
that case, do not set the config file (or most important, do not died).
  
  Revision  Changes    Path
  1.21      +7 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StandardContext.java	3 Mar 2003 15:46:45 -0000	1.20
  +++ StandardContext.java	5 Mar 2003 05:01:06 -0000	1.21
  @@ -3738,8 +3738,9 @@
           boolean ok = true;
   
           // Set config file name
  -        if (getConfigFile() == null) {
  -            String appBase = getAppBase();
  +        String appBase = getAppBase();
  +        if (getConfigFile() == null && appBase != null) {
  +            
               String name = getName();
               if (name.equals("")) {
                   name = "ROOT";
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message