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 StandardContext.java
Date Tue, 13 Mar 2001 06:48:09 GMT
remm        01/03/12 22:48:09

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Now recreates the naming environment when reloading a context.
  - Fix problems with how the read only flags were set.
  
  Revision  Changes    Path
  1.42      +17 -6     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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- StandardContext.java	2001/02/26 03:51:35	1.41
  +++ StandardContext.java	2001/03/13 06:48:08	1.42
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.41 2001/02/26 03:51:35 glenn Exp $
  - * $Revision: 1.41 $
  - * $Date: 2001/02/26 03:51:35 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.42 2001/03/13 06:48:08 remm Exp $
  + * $Revision: 1.42 $
  + * $Date: 2001/03/13 06:48:08 $
    *
    * ====================================================================
    *
  @@ -138,7 +138,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.41 $ $Date: 2001/02/26 03:51:35 $
  + * @version $Revision: 1.42 $ $Date: 2001/03/13 06:48:08 $
    */
   
   public class StandardContext
  @@ -2209,6 +2209,17 @@
   	    }
   	}
   
  +        // Create and register the associated naming context, if internal 
  +        // naming is used
  +        if (isUseNaming()) {
  +            try {
  +                createNamingContext();
  +            } catch (NamingException e) {
  +                log(sm.getString("standardContext.namingInitFailed",
  +                                 getName()));
  +            }
  +        }
  +
           // Restart our application event listeners and filters
           listenerStart();
           filterStart();
  @@ -3244,12 +3255,12 @@
           Hashtable contextEnv = new Hashtable();
           javax.naming.Context namingContext = 
               new NamingContext(contextEnv, getName());
  -        ContextAccessController.setSecurityToken(this, this);
  +        ContextAccessController.setSecurityToken(getName(), this);
           ContextBindings.bindContext(this, namingContext, this);
           ContextBindings.bindThread(this, this);
   
           // Setting the context in read/write mode
  -        ContextAccessController.setWritable(this, this);
  +        ContextAccessController.setWritable(getName(), this);
   
           // Creating the comp subcontext
           javax.naming.Context compCtx = namingContext.createSubcontext("comp");
  
  
  

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


Mime
View raw message