Author: remy.maucherat(a)jboss.com Date: 2010-04-14 09:48:47 -0400 (Wed, 14 Apr 2010) New Revision: 1437 Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteReader.java branches/2.1.x/webapps/docs/changelog.xml Log: - JBWEB-165: Fix oops. Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteReader.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/CoyoteReader.java 2010-04-14 13:48:02 UTC (rev 1436) +++ branches/2.1.x/java/org/apache/catalina/connector/CoyoteReader.java 2010-04-14 13:48:47 UTC (rev 1437) @@ -156,8 +156,8 @@ mark(MAX_LINE_LENGTH); while ((pos < MAX_LINE_LENGTH) && (end < 0)) { int nRead = read(lineBuffer, pos, MAX_LINE_LENGTH - pos); - if (nRead < 0 && aggregator == null) { - if (pos == 0) { + if (nRead < 0) { + if (pos == 0 && aggregator == null) { return null; } end = pos; Modified: branches/2.1.x/webapps/docs/changelog.xml =================================================================== --- branches/2.1.x/webapps/docs/changelog.xml 2010-04-14 13:48:02 UTC (rev 1436) +++ branches/2.1.x/webapps/docs/changelog.xml 2010-04-14 13:48:47 UTC (rev 1437) @@ -29,9 +29,13 @@ <fix> Fix incomplete write logic in APR. (jfclere) </fix> - <fix> <jboss-jira>JBWEB-153</jboss-jira> <bug>43839</bug> + <fix> + <jira>153</jira>: <bug>43839</bug> Parent context cookie overwriting URL encoded cookie. (markt/mmillson) </fix> + <fix> + <jira>165</jira>: Correct fix for <bug>42727</bug>. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">