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/startup Catalina.java
Date Sat, 17 Nov 2001 08:40:44 GMT
remm        01/11/17 00:40:44

  Modified:    catalina/src/share/org/apache/catalina/startup Tag:
                        tomcat_40_branch Catalina.java
  Log:
  - Only set the initial context factory if it's not been set.
    Patch submitted by Han Ming Ong <hanming at chirpyfish.org>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.32.2.1  +11 -6     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.32
  retrieving revision 1.32.2.1
  diff -u -r1.32 -r1.32.2.1
  --- Catalina.java	2001/09/11 23:34:43	1.32
  +++ Catalina.java	2001/11/17 08:40:44	1.32.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.32 2001/09/11 23:34:43 craigmcc Exp $
  - * $Revision: 1.32 $
  - * $Date: 2001/09/11 23:34:43 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.32.2.1 2001/11/17 08:40:44 remm Exp $
  + * $Revision: 1.32.2.1 $
  + * $Date: 2001/11/17 08:40:44 $
    *
    * ====================================================================
    *
  @@ -98,7 +98,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.32 $ $Date: 2001/09/11 23:34:43 $
  + * @version $Revision: 1.32.2.1 $ $Date: 2001/11/17 08:40:44 $
    */
   
   public class Catalina {
  @@ -744,8 +744,13 @@
                   value = value + ":" + oldValue;
               }
               System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, value);
  -            System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  -                               "org.apache.naming.java.javaURLContextFactory");
  +            value = System.getProperty
  +                (javax.naming.Context.INITIAL_CONTEXT_FACTORY);
  +            if (value == null) {
  +                System.setProperty
  +                    (javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  +                     "org.apache.naming.java.javaURLContextFactory");
  +            }
           }
   
           // If a SecurityManager is being used, set properties for
  
  
  

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


Mime
View raw message