tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Wed, 03 Nov 2004 22:23:22 GMT
keith       2004/11/03 14:23:22

  Modified:    catalina/src/share/org/apache/catalina/core Tag: TOMCAT_5_0
                        StandardContext.java
  Log:
  Backport to 5.0 my patch Remy applied to 5.5 to avoid npes on startup
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.130.2.5 +2 -2      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.130.2.4
  retrieving revision 1.130.2.5
  diff -u -r1.130.2.4 -r1.130.2.5
  --- StandardContext.java	31 Aug 2004 15:08:02 -0000	1.130.2.4
  +++ StandardContext.java	3 Nov 2004 22:23:21 -0000	1.130.2.5
  @@ -4147,7 +4147,7 @@
   
           // Look for a realm - that may have been configured earlier. 
           // If the realm is added after context - it'll set itself.
  -        if( realm == null ) {
  +        if( realm == null && mserver != null ) {
               ObjectName realmName=null;
               try {
                   realmName=new ObjectName( getEngineName() + ":type=Host,host=" + 
  
  
  

---------------------------------------------------------------------
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