You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2017/05/04 11:16:02 UTC
svn commit: r1793771 - in /tomcat/trunk:
java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
webapps/docs/changelog.xml
Author: violetagg
Date: Thu May 4 11:16:02 2017
New Revision: 1793771
URL: http://svn.apache.org/viewvc?rev=1793771&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61003
Ensure the flags for reading/writing are correctly reset even if some exceptions occurred during processing.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1793771&r1=1793770&r2=1793771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java Thu May 4 11:16:02 2017
@@ -236,6 +236,7 @@ public class AsyncChannelWrapperSecure i
"asyncChannelWrapperSecure.wrongStateWrite")));
}
} catch (Exception e) {
+ writing.set(false);
future.fail(e);
}
}
@@ -335,6 +336,7 @@ public class AsyncChannelWrapperSecure i
"asyncChannelWrapperSecure.wrongStateRead")));
}
} catch (Exception e) {
+ reading.set(false);
future.fail(e);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793771&r1=1793770&r2=1793771&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 4 11:16:02 2017
@@ -161,6 +161,11 @@
<code>o.a.tomcat.websocket.WsSession#resume</code> that can be used to
suspend/resume reading of the incoming messages. (violetagg)
</add>
+ <fix>
+ <bug>61003</bug>: Ensure the flags for reading/writing in
+ <code>o.a.t.websocket.AsyncChannelWrapperSecure</code> are correctly
+ reset even if some exceptions occurred during processing. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Web Applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org