Author: remy.maucherat(a)jboss.com Date: 2014-04-28 05:00:11 -0400 (Mon, 28 Apr 2014) New Revision: 2406 Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/Connector.java Log: BZ1091849: Switch back the default connector to java.io. Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/Connector.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-04-22 15:27:49 UTC (rev 2405) +++ branches/7.4.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-04-28 09:00:11 UTC (rev 2406) @@ -588,7 +588,7 @@ } } else { if ("HTTP/1.1".equals(protocol) || "http".equals(protocol)) { - try { + /*try { Class.forName("java.nio.channels.CompletionHandler"); setProtocolHandlerClassName ("org.apache.coyote.http11.Http11NioProtocol"); @@ -597,7 +597,9 @@ setProtocolHandlerClassName ("org.apache.coyote.http11.Http11Protocol"); CatalinaLogger.CONNECTOR_LOGGER.usingJavaIoConnector(); - } + }*/ + setProtocolHandlerClassName + ("org.apache.coyote.http11.Http11Protocol"); } else if ("AJP/1.3".equals(protocol) || "ajp".equals(protocol)) { setProtocolHandlerClassName ("org.apache.coyote.ajp.AjpProtocol");