cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java

[remm]

remm        2004/10/04 06:48:11

  Modified:    http11/src/java/org/apache/coyote/http11 Http11Protocol.java
  Log:
  - Attribute translation is now useless (readd it if TC 3 needs it).
  - Remove the * 1000 in setTimeout, which messes with the java bean semantics, and is 
screwing up JMX.
  
  Revision  Changes    Path
  1.59      +2 -24     
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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Http11Protocol.java       1 Oct 2004 23:46:57 -0000       1.58
  +++ Http11Protocol.java       4 Oct 2004 13:48:11 -0000       1.59
  @@ -128,8 +128,7 @@
               while( attE.hasMoreElements() ) {
                   String key=(String)attE.nextElement();
                   Object v=attributes.get( key );
  -                String trnName = translateAttributeName(key);
  -                socketFactory.setAttribute( trnName, v );
  +                socketFactory.setAttribute( key, v );
               }
           }
   
  @@ -605,7 +604,7 @@
       }
   
       public void setTimeout( int timeouts ) {
  -        timeout = timeouts * 1000;
  +        timeout = timeouts;
           setAttribute("timeout", "" + timeouts);
       }
   
  @@ -809,27 +808,6 @@
                   throw sfex;
               }
           }
  -    }
  -
  -    private String translateAttributeName(String name) {
  -        if ("clientAuth".equals(name)) {
  -            return "clientauth";
  -        } else if ("keystoreFile".equals(name)) {
  -            return "keystore";
  -        } else if ("randomFile".equals(name)) {
  -            return "randomfile";
  -        } else if ("rootFile".equals(name)) {
  -            return "rootfile";
  -        } else if ("keystorePass".equals(name)) {
  -            return "keypass";
  -        } else if ("keystoreType".equals(name)) {
  -            return "keytype";
  -        } else if ("sslProtocol".equals(name)) {
  -            return "protocol";
  -        } else if ("sslProtocols".equals(name)) {
  -            return "protocols";
  -        }
  -        return name;
       }
   
       protected String domain;
  
  
  

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