tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Tue, 19 Sep 2000 00:09:09 GMT
craigmcc    00/09/18 17:09:08

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Sorry ... the previous patch was incomplete -- CertificatesValve can be
  loaded dynamically even though it imports classes that do not exist when
  JSSE is missing.  This commit adds an explicit test for existence of one
  of the JSSE classes.
  
  Revision  Changes    Path
  1.14      +14 -4     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ContextConfig.java	2000/09/18 23:51:03	1.13
  +++ ContextConfig.java	2000/09/19 00:09:07	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.13 2000/09/18 23:51:03 craigmcc Exp $
  - * $Revision: 1.13 $
  - * $Date: 2000/09/18 23:51:03 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.14 2000/09/19 00:09:07 craigmcc Exp $
  + * $Revision: 1.14 $
  + * $Date: 2000/09/19 00:09:07 $
    *
    * ====================================================================
    *
  @@ -108,7 +108,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.13 $ $Date: 2000/09/18 23:51:03 $
  + * @version $Revision: 1.14 $ $Date: 2000/09/19 00:09:07 $
    */
   
   public final class ContextConfig
  @@ -320,6 +320,16 @@
        * (because the JSSE classes are not available), silently continue.
        */
       private void certificatesConfig() {
  +
  +        // Validate that the JSSE classes are present
  +        try {
  +            Class clazz = this.getClass().getClassLoader().loadClass
  +                ("javax.net.ssl.SSLSocket");
  +            if (clazz == null)
  +                return;
  +        } catch (Throwable t) {
  +            return;
  +        }
   
           // Instantiate a new CertificatesValve if possible
           Valve certificates = null;
  
  
  

Mime
View raw message