[tomcat] branch master updated: Run internal upgrade handler on NIO as well

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new d228347  Run internal upgrade handler on NIO as well
d228347 is described below

commit d228347196ff6374a4e13b2b8ac5bd2c42b7241f
Author: remm <re...@apache.org>
AuthorDate: Fri Apr 12 17:36:19 2019 +0200

    Run internal upgrade handler on NIO as well
    
    Set the useAsyncIO attribute on the connector (I'll leave it even if the
    default value changes, just in case).
---
 .../org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 367f06f..841989a 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -60,8 +60,8 @@ public class TestUpgradeInternalHandler extends TomcatBaseTest {
     @Test
     public void testUpgradeInternal() throws Exception {
         Assume.assumeTrue(
-                "Only supported on NIO 2",
-                getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
+                "Only supported on NIO X",
+                getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio"));
 
         UpgradeConnection uc = doUpgrade(EchoAsync.class);
         PrintWriter pw = new PrintWriter(uc.getWriter());
@@ -87,6 +87,7 @@ public class TestUpgradeInternalHandler extends TomcatBaseTest {
             Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
+        tomcat.getConnector().setProperty("useAsyncIO", "true");
 
         // No file system docBase required
         Context ctx = tomcat.addContext("", null);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org