tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java
Date Tue, 02 Mar 2004 01:17:40 GMT
luehe       2004/03/01 17:17:39

  Modified:    http11/src/java/org/apache/coyote/http11 Http11Protocol.java
  Log:
  Fixed indentation
  
  Revision  Changes    Path
  1.53      +19 -23    jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
  
  Index: Http11Protocol.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Http11Protocol.java	24 Feb 2004 08:50:56 -0000	1.52
  +++ Http11Protocol.java	2 Mar 2004 01:17:39 -0000	1.53
  @@ -759,30 +759,26 @@
        *  @exception TomcatException Unable to resolve classes
        */
       private void checkSocketFactory() throws Exception {
  -    if(secure) {
  -        try {
  -        // The SSL setup code has been moved into
  -        // SSLImplementation since SocketFactory doesn't
  -        // provide a wide enough interface
  -        sslImplementation=SSLImplementation.getInstance
  -            (sslImplementationName);
  -                socketFactory = 
  -                        sslImplementation.getServerSocketFactory();
  -        ep.setServerSocketFactory(socketFactory);
  -        } catch (ClassNotFoundException e){
  -        throw e;
  +        if (secure) {
  +            try {
  +                // The SSL setup code has been moved into
  +                // SSLImplementation since SocketFactory doesn't
  +                // provide a wide enough interface
  +                sslImplementation =
  +                    SSLImplementation.getInstance(sslImplementationName);
  +                socketFactory = sslImplementation.getServerSocketFactory();
  +                ep.setServerSocketFactory(socketFactory);
  +            } catch (ClassNotFoundException e){
  +                throw e;
  +            }
  +        } else if (socketFactoryName != null) {
  +            try {
  +                socketFactory = string2SocketFactory(socketFactoryName);
  +                ep.setServerSocketFactory(socketFactory);
  +            } catch(Exception sfex) {
  +                throw sfex;
  +            }
           }
  -    }
  -    else {
  -        if (socketFactoryName != null) {
  -        try {
  -            socketFactory = string2SocketFactory(socketFactoryName);
  -            ep.setServerSocketFactory(socketFactory);
  -        } catch(Exception sfex) {
  -            throw sfex;
  -        }
  -        }
  -    }
       }
   
       /*
  
  
  

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