billbarker    2003/08/12 22:32:53

  Modified:    util/java/org/apache/tomcat/util/net/jsse
                        JSSE13SocketFactory.java JSSE14SocketFactory.java
                        JSSESocketFactory.java
  Log:
  Getting the tab-police off my case ;-).
  
  Revision  Changes    Path
  1.4       +3 -3      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
  
  Index: JSSE13SocketFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JSSE13SocketFactory.java  13 Aug 2003 05:29:08 -0000      1.3
  +++ JSSE13SocketFactory.java  13 Aug 2003 05:32:53 -0000      1.4
  @@ -169,11 +169,11 @@
           }
       }
       protected String[] getEnabledProtocols(SSLServerSocket socket,
  -                                        String requestedProtocols){
  -     return null;
  +                                           String requestedProtocols){
  +        return null;
       }
       protected void setEnabledProtocols(SSLServerSocket socket, 
  -                                          String [] protocols){
  +                                             String [] protocols){
       }
   
   }
  
  
  
  1.11      +3 -3      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
  
  Index: JSSE14SocketFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JSSE14SocketFactory.java  13 Aug 2003 05:29:08 -0000      1.10
  +++ JSSE14SocketFactory.java  13 Aug 2003 05:32:53 -0000      1.11
  @@ -192,14 +192,14 @@
           return tms;
       }
       protected void setEnabledProtocols(SSLServerSocket socket, String []protocols){
  -     if (protocols != null) {
  +        if (protocols != null) {
               socket.setEnabledProtocols(protocols);
           }
       }
   
       protected String[] getEnabledProtocols(SSLServerSocket socket,
  -                                        String requestedProtocols){
  -     String[] supportedProtocols = socket.getSupportedProtocols();
  +                                           String requestedProtocols){
  +        String[] supportedProtocols = socket.getSupportedProtocols();
   
           String[] enabledProtocols = null;
   
  
  
  
  1.7       +4 -4      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
  
  Index: JSSESocketFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JSSESocketFactory.java    13 Aug 2003 05:29:08 -0000      1.6
  +++ JSSESocketFactory.java    13 Aug 2003 05:32:53 -0000      1.7
  @@ -302,7 +302,7 @@
        * the requested protocol variants are supported
        */
       abstract protected String[] getEnabledProtocols(SSLServerSocket socket,
  -                                                 String requestedProtocols);
  +                                                    String requestedProtocols);
   
       /**
        * Set the SSL protocol variants to be enabled.
  @@ -310,7 +310,7 @@
        * @param protocols the protocols to use.
        */
       abstract protected void setEnabledProtocols(SSLServerSocket socket, 
  -                                         String [] protocols);
  +                                            String [] protocols);
   
       /**
        * Configures the given SSL server socket with the requested cipher suites,
  @@ -325,8 +325,8 @@
           }
   
           String requestedProtocols = (String) attributes.get("protocols");
  -     setEnabledProtocols(socket, getEnabledProtocols(socket, 
  -                                                      requestedProtocols));
  +        setEnabledProtocols(socket, getEnabledProtocols(socket, 
  +                                                         requestedProtocols));
   
           // we don't know if client auth is needed -
           // after parsing the request we may re-handshake
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to