You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2004/10/04 11:56:08 UTC

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector EditConnectorAction.java

remm        2004/10/04 02:56:08

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
                        EditConnectorAction.java
  Log:
  - Use the more robust String.valueOf, as it is acceptable that a lot of the attributes are null (because they are only relevant to a certain
    protocol handler).
  
  Revision  Changes    Path
  1.13      +18 -26    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
  
  Index: EditConnectorAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EditConnectorAction.java	10 Jul 2004 06:56:14 -0000	1.12
  +++ EditConnectorAction.java	4 Oct 2004 09:56:08 -0000	1.13
  @@ -147,64 +147,64 @@
               
               attribute = "acceptCount";
               connectorFm.setAcceptCountText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());          
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));          
               attribute = "compression";
               connectorFm.setCompression
                   ((String) mBServer.getAttribute(cname, attribute));          
               attribute = "connectionLinger";
               connectorFm.setConnLingerText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());            
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));            
               attribute = "connectionTimeout";
               connectorFm.setConnTimeOutText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());             
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));             
               attribute = "connectionUploadTimeout";
               connectorFm.setConnUploadTimeOutText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());              
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));              
               attribute = "disableUploadTimeout";
               connectorFm.setDisableUploadTimeout
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());       
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));       
               attribute = "bufferSize";
               connectorFm.setBufferSizeText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());            
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));            
               attribute = "enableLookups";
               connectorFm.setEnableLookups
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());            
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));            
               attribute = "address";
               connectorFm.setAddress
                   ((String) mBServer.getAttribute(cname, attribute));          
               attribute = "maxKeepAliveRequests";
               connectorFm.setMaxKeepAliveText
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());       
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));       
               attribute = "maxSpareThreads";
               connectorFm.setMaxSpare
  -                ((String) mBServer.getAttribute(cname, attribute));         
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));         
               attribute = "maxThreads";
               connectorFm.setMaxThreads
  -                ((String) mBServer.getAttribute(cname, attribute));       
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));       
               attribute = "minSpareThreads";
               connectorFm.setMinSpare
  -                ((String) mBServer.getAttribute(cname, attribute));        
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));        
               attribute = "threadPriority";
               connectorFm.setThreadPriority
  -                (((Integer) mBServer.getAttribute(cname, attribute)).toString());
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));
               attribute = "secure";
               connectorFm.setSecure
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());;       
  +                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
               attribute = "tcpNoDelay";
               connectorFm.setTcpNoDelay
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());;        
  +                (String.valueOf(mBServer.getAttribute(cname, attribute)));
               attribute = "xpoweredBy";
               connectorFm.setXpoweredBy
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());;
  +                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
               attribute = "URIEncoding";
               connectorFm.setURIEncodingText
                   ((String) mBServer.getAttribute(cname, attribute));
               attribute = "useBodyEncodingForURI";
               connectorFm.setUseBodyEncodingForURIText
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());       
  +                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
               attribute = "allowTrace";
               connectorFm.setAllowTraceText
  -                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());       
  +                (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
             
               // Ports
               attribute = "port";
  @@ -213,14 +213,6 @@
               attribute = "redirectPort";
               connectorFm.setRedirectPortText
                   (((Integer) mBServer.getAttribute(cname, attribute)).toString());            
  -            
  -            // Processors
  -            attribute = "minProcessors";
  -            //connectorFm.setMinProcessorsText
  -            //    (((Integer) mBServer.getAttribute(cname, attribute)).toString());            
  -            attribute = "maxProcessors";
  -            //connectorFm.setMaxProcessorsText
  -            //    (((Integer) mBServer.getAttribute(cname, attribute)).toString());            
               
               // Supported by HTTP and HTTPS only
               if (!("AJP".equalsIgnoreCase(connectorType))) {
  
  
  

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