[jbossweb-commits] JBossWeb SVN: r2156 - in branches/7.2.x: src/main/java/org/apache/catalina/connector and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2013-02-05 10:56:42 -0500 (Tue, 05 Feb 2013)
New Revision: 2156
Modified:
branches/7.2.x/pom.xml
branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
branches/7.2.x/webapps/docs/changelog.xml
Log:
- Remove the connector selection logic.
- Changelog update.
Modified: branches/7.2.x/pom.xml
===================================================================
(Binary files differ)
Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-02-04
14:49:31 UTC (rev 2155)
+++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-02-05
15:56:42 UTC (rev 2156)
@@ -585,7 +585,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");
@@ -594,7 +594,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");
Modified: branches/7.2.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.2.x/webapps/docs/changelog.xml 2013-02-04 14:49:31 UTC (rev 2155)
+++ branches/7.2.x/webapps/docs/changelog.xml 2013-02-05 15:56:42 UTC (rev 2156)
@@ -16,6 +16,23 @@
<body>
+<section name="JBoss Web 7.2.0.Final (remm)">
+ <subsection name="General">
+ <changelog>
+ <fix>
+ Switch to Eclipse JDT packaging for building. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Remove connector selection logic based on the JDK version. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.2.0.Beta2 (remm)">
<subsection name="Catalina">
<changelog>