Author: markt
Date: Thu Aug 25 12:32:06 2011
New Revision: 1161544
URL: http://svn.apache.org/viewvc?rev=1161544&view=rev
Log:
Revert unnecessary changes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 12:32:06 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1161544&r1=1161543&r2=1161544&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Thu Aug 25 12:32:06 2011
@@ -225,12 +225,6 @@ public abstract class AbstractAjpProcess
protected long bytesWritten = 0;
- /**
- * Request body bytes read for the current request.
- */
- protected long bodyBytesRead = 0;
-
-
// ------------------------------------------------------------ Constructor
public AbstractAjpProcessor(int packetSize, AbstractEndpoint endpoint) {
@@ -536,7 +530,6 @@ public abstract class AbstractAjpProcess
response.recycle();
certificates.recycle();
bytesWritten = 0;
- bodyBytesRead = 0;
}
@@ -1010,9 +1003,9 @@ public abstract class AbstractAjpProcess
*/
protected class SocketInputBuffer implements InputBuffer {
+
/**
- * Read bytes into the specified chunk. If no chunk is specified, the
- * bytes are swallowed.
+ * Read bytes into the specified chunk.
*/
@Override
public int doRead(ByteChunk chunk, Request req)
@@ -1032,12 +1025,10 @@ public abstract class AbstractAjpProcess
}
}
ByteChunk bc = bodyBytes.getByteChunk();
- bodyBytesRead += bc.getLength();
- if (chunk != null) {
- chunk.setBytes(bc.getBuffer(), bc.getStart(), bc.getLength());
- }
+ chunk.setBytes(bc.getBuffer(), bc.getStart(), bc.getLength());
empty = true;
- return bc.getLength();
+ return chunk.getLength();
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
