Author: markt
Date: Wed Mar 22 18:10:48 2017
New Revision: 1788147
URL: http://svn.apache.org/viewvc?rev=1788147&view=rev
Log:
Fix failing unit test for 8.0.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java?rev=1788147&r1=1788146&r2=1788147&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
Wed Mar 22 18:10:48 2017
@@ -52,7 +52,7 @@ public class Nio2ServletInputStream exte
@Override
public void completed(Integer nBytes, SocketWrapper<Nio2Channel>
attachment) {
boolean notify = false;
- synchronized (completionHandler) {
+ synchronized (Nio2ServletInputStream.this.wrapper) {
if (nBytes.intValue() < 0) {
if (closed) {
readPending = false;
@@ -87,7 +87,7 @@ public class Nio2ServletInputStream exte
@Override
protected boolean doIsReady() throws IOException {
- synchronized (completionHandler) {
+ synchronized (wrapper) {
if (readPending) {
interest = true;
return false;
@@ -122,7 +122,7 @@ public class Nio2ServletInputStream exte
protected int doRead(boolean block, byte[] b, int off, int len)
throws IOException {
- synchronized (completionHandler) {
+ synchronized (wrapper) {
if (readPending) {
return 0;
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1788147&r1=1788146&r2=1788147&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Mar 22 18:10:48 2017
@@ -59,6 +59,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ When using the NIO2 connector, ensure a WebSocket close frame is
+ processed before the end of stream is processed to ensure that the end
+ of stream is processed correctly. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
