Reverted checkin, we can use a fully qualified class name inside of the protocol

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@416408 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index 2e35525..2e32c82 100644 (file)
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -623,9 +623,7 @@ public class Connector
         }\r
 \r
         if (apr) {\r
-            if ("HTTP/1.1/NIO".equals(protocol)) {\r
-                setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");\r
-            } else if ("HTTP/1.1".equals(protocol)) {\r
+            if ("HTTP/1.1".equals(protocol)) {\r
                 setProtocolHandlerClassName\r
                     ("org.apache.coyote.http11.Http11AprProtocol");\r
             } else if ("AJP/1.3".equals(protocol)) {\r
@@ -638,9 +636,7 @@ public class Connector
                     ("org.apache.coyote.http11.Http11AprProtocol");\r
             }\r
         } else {\r
-            if ("HTTP/1.1/NIO".equals(protocol)) {\r
-                setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");\r
-            }else if ("HTTP/1.1".equals(protocol)) {\r
+            if ("HTTP/1.1".equals(protocol)) {\r
                 setProtocolHandlerClassName\r
                     ("org.apache.coyote.http11.Http11Protocol");\r
             } else if ("AJP/1.3".equals(protocol)) {\r