remm        00/12/15 11:48:26

  Modified:    catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Fix a NPE if the NamingContext was initialized with an environment.
    Submitted by Tom Klaasen <Tom.Klaasen at the-ecorp.com>.
  
  Revision  Changes    Path
  1.2       +4 -3      
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
  
  Index: NamingContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamingContext.java        2000/11/02 06:14:16     1.1
  +++ NamingContext.java        2000/12/15 19:48:25     1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.1 2000/11/02 06:14:16 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/11/02 06:14:16 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.2 2000/12/15 19:48:25 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/12/15 19:48:25 $
    *
    * ====================================================================
    *
  @@ -85,7 +85,7 @@
    * Catalina JNDI Context implementation.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.1 $ $Date: 2000/11/02 06:14:16 $
  + * @version $Revision: 1.2 $ $Date: 2000/12/15 19:48:25 $
    */
   
   public class NamingContext implements Context {
  @@ -109,6 +109,7 @@
       public NamingContext(Hashtable env, String name) 
           throws NamingException {
           this.bindings = new Hashtable();
  +        this.env = new Hashtable();
           // FIXME ? Could be put in the environment ?
           this.name = name;
           // Populating the environment hashtable
  
  
  

Reply via email to