svn commit: r1646355 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpMessage.java AjpProcessor.java

[markt]

Author: markt
Date: Wed Dec 17 22:41:11 2014
New Revision: 1646355

URL: http://svn.apache.org/r1646355
Log:
Header size is a constant.

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1646355&r1=1646354&r2=1646355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java Wed Dec 17 22:41:11 
2014
@@ -299,11 +299,6 @@ public class AjpMessage {
     }
 
 
-    public int getHeaderLength() {
-        return Constants.H_SIZE;
-    }
-
-
     public int getPacketSize() {
         return buf.length;
     }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1646355&r1=1646354&r2=1646355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Dec 17 
22:41:11 2014
@@ -976,9 +976,8 @@ public class AjpProcessor<S> extends Abs
         throws IOException {
 
         byte[] buf = message.getBuffer();
-        int headerLength = message.getHeaderLength();
 
-        if (!read(buf, 0, headerLength, block)) {
+        if (!read(buf, 0, Constants.H_SIZE, block)) {
             return false;
         }
 
@@ -1001,7 +1000,7 @@ public class AjpProcessor<S> extends Abs
                         Integer.valueOf(messageLength),
                         Integer.valueOf(buf.length)));
             }
-            read(buf, headerLength, messageLength, true);
+            read(buf, Constants.H_SIZE, messageLength, true);
             return true;
         }
     }



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