svn commit: r1104403 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProtocol.java AjpNioProtocol.java AjpProtocol.java

[markt]

Author: markt
Date: Tue May 17 16:52:51 2011
New Revision: 1104403

URL: http://svn.apache.org/viewvc?rev=1104403&view=rev
Log:
Better align AJP connector code
Fix some copy/paste errors

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue May 17 
16:52:51 2011
@@ -70,7 +70,8 @@ public class AjpAprProtocol extends Abst
         setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
         setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
         setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
-        setUseSendfile(Constants.DEFAULT_USE_SENDFILE);
+        // AJP does not use Send File
+        ((AprEndpoint) endpoint).setUseSendfile(false);
     }
 
     
@@ -86,11 +87,6 @@ public class AjpAprProtocol extends Abst
     // --------------------------------------------------------- Public Methods
 
 
-    public boolean getUseSendfile() { return endpoint.getUseSendfile(); }
-    public void setUseSendfile(@SuppressWarnings("unused") boolean 
useSendfile) {
-        /* No sendfile for AJP */
-    }
-
     public int getPollTime() { return ((AprEndpoint)endpoint).getPollTime(); }
     public void setPollTime(int pollTime) { 
((AprEndpoint)endpoint).setPollTime(pollTime); }
 
@@ -120,7 +116,7 @@ public class AjpAprProtocol extends Abst
             new ConcurrentHashMap<SocketWrapper<Long>, AjpAprProcessor>();
 
         protected ConcurrentLinkedQueue<AjpAprProcessor> recycledProcessors = 
-            new ConcurrentLinkedQueue<AjpAprProcessor>() {
+                new ConcurrentLinkedQueue<AjpAprProcessor>() {
             private static final long serialVersionUID = 1L;
             protected AtomicInteger size = new AtomicInteger(0);
             @Override

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue May 17 
16:52:51 2011
@@ -84,13 +84,6 @@ public class AjpNioProtocol extends Abst
     private AjpConnectionHandler cHandler;
 
 
-    // --------------------------------------------------------- Public Methods
-
-
-    // AJP does not use Send File.
-    public boolean getUseSendfile() { return false; }
-
-
     // ----------------------------------------------------- JMX related 
methods
 
     @Override
@@ -194,7 +187,7 @@ public class AjpNioProtocol extends Abst
         
         /**
          * Use this only if the processor is not available, otherwise use
-         * {@link #release(NioChannel, Http11NioProcessor).
+         * {@link #release(NioChannel, AjpNioProcessor).
          */
         @Override
         public void release(NioChannel socket) {
@@ -232,7 +225,7 @@ public class AjpNioProtocol extends Abst
                     // with "ERROR" level, so it will show up even on
                     // less-than-verbose logs.
                     AjpNioProtocol.log.error
-                        (sm.getString("http11protocol.proto.error"), e);
+                        (sm.getString("ajpprotocol.proto.error"), e);
                 } finally {
                     if (processor.isAsync()) {
                         state = processor.asyncPostProcess();

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Tue May 17 
16:52:51 2011
@@ -105,7 +105,7 @@ public class AjpProtocol extends Abstrac
             new ConcurrentHashMap<SocketWrapper<Socket>, AjpProcessor>();
 
         protected ConcurrentLinkedQueue<AjpProcessor> recycledProcessors = 
-            new ConcurrentLinkedQueue<AjpProcessor>() {
+                new ConcurrentLinkedQueue<AjpProcessor>() {
             private static final long serialVersionUID = 1L;
             protected AtomicInteger size = new AtomicInteger(0);
             @Override



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