Author: markt
Date: Tue Jul 5 19:20:53 2016
New Revision: 1751539
URL: http://svn.apache.org/viewvc?rev=1751539&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1751539&r1=1751538&r2=1751539&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Tue Jul
5 19:20:53 2016
@@ -771,9 +771,9 @@ public class TestHttp11Processor extends
@Override
- protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+ protected void doPut(HttpServletRequest req, final HttpServletResponse
resp)
throws ServletException, IOException {
- AsyncContext ac = req.startAsync();
+ final AsyncContext ac = req.startAsync();
ac.start(new Runnable() {
@Override
public void run() {
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1751539&r1=1751538&r2=1751539&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Tue Jul 5 19:20:53 2016
@@ -192,7 +192,7 @@ public class TestUpgradeInternalHandler
// Arbitrarily located in the init, could be in the initial read
event, asynchronous, etc.
// Note: the completion check used will not call the completion
handler if the IO completed inline and without error.
// Using a completion check that always calls complete would be
easier here since the action is the same even with inline completion.
- ByteBuffer buffer = ByteBuffer.allocate(1024);
+ final ByteBuffer buffer = ByteBuffer.allocate(1024);
CompletionState state = wrapper.read(false, 10, TimeUnit.SECONDS,
null, SocketWrapperBase.READ_DATA, new CompletionHandler<Long, Void>() {
@Override
public void completed(Long result, Void attachment) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
