[Jboss-svn-commits] JBL Code SVN: r1643 - trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-11-24 09:11:57 -0500 (Thu, 24 Nov 2005)
New Revision: 1643

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
   trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java
   trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java
Log:
- Remove useless fields.

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-24 14:00:23 UTC (rev 1642)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-24 14:11:57 UTC (rev 1643)
@@ -280,12 +280,6 @@
 
 
     /**
-     * Socket buffering.
-     */
-    protected int socketBuffer = -1;
-
-
-    /**
      * Max save post size.
      */
     protected int maxSavePostSize = 4 * 1024;
@@ -672,21 +666,6 @@
     }
 
     /**
-     * Set the socket buffer flag.
-     */
-    public void setSocketBuffer(int socketBuffer) {
-        this.socketBuffer = socketBuffer;
-        outputBuffer.setSocketBuffer(socketBuffer);
-    }
-
-    /**
-     * Get the socket buffer flag.
-     */
-    public int getSocketBuffer() {
-        return socketBuffer;
-    }
-
-    /**
      * Set the upload timeout.
      */
     public void setTimeout( int timeouts ) {

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java	2005-11-24 14:00:23 UTC (rev 1642)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java	2005-11-24 14:11:57 UTC (rev 1643)
@@ -192,10 +192,8 @@
     private int maxKeepAliveRequests=100; // as in Apache HTTPD server
     private int timeout = 300000;   // 5 minutes as in Apache HTTPD server
     private int maxSavePostSize = 4 * 1024;
-    private int maxHttpHeaderSize = 4 * 1024;
-    private int socketCloseDelay=-1;
+    private int maxHttpHeaderSize = 8 * 1024;
     private boolean disableUploadTimeout = true;
-    private int socketBuffer = 9000;
     private Adapter adapter;
     private Http11ConnectionHandler cHandler;
 
@@ -331,14 +329,6 @@
         disableUploadTimeout = isDisabled;
     }
 
-    public int getSocketBuffer() {
-        return socketBuffer;
-    }
-
-    public void setSocketBuffer(int valueI) {
-        socketBuffer = valueI;
-    }
-
     public String getCompression() {
         return compression;
     }
@@ -465,15 +455,6 @@
         }
     }
 
-    public int getSocketCloseDelay() {
-        return socketCloseDelay;
-    }
-
-    public void setSocketCloseDelay( int d ) {
-        socketCloseDelay=d;
-        setAttribute("socketCloseDelay", "" + d);
-    }
-
     public void setServer( String server ) {
         this.server = server;
     }
@@ -612,7 +593,6 @@
                     processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
                     processor.setCompressableMimeTypes(proto.compressableMimeTypes);
                     processor.setRestrictedUserAgents(proto.restrictedUserAgents);
-                    processor.setSocketBuffer(proto.socketBuffer);
                     processor.setMaxSavePostSize(proto.maxSavePostSize);
                     processor.setServer(proto.server);
                     localProcessor.set(processor);

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java	2005-11-24 14:00:23 UTC (rev 1642)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java	2005-11-24 14:11:57 UTC (rev 1643)
@@ -195,14 +195,6 @@
 
 
     /**
-     * Set the socket buffer size.
-     */
-    public void setSocketBuffer(int socketBufferSize) {
-        // FIXME: Remove
-    }
-
-
-    /**
      * Add an output filter to the filter library.
      */
     public void addFilter(OutputFilter filter) {
@@ -297,7 +289,7 @@
     public void reset() {
 
         if (committed)
-            throw new IllegalStateException(/*FIXME:Put an error message*/);
+            throw new IllegalStateException();
 
         // Recycle Request object
         response.recycle();