Author: kkolinko
Date: Sat Jan 16 00:29:12 2016
New Revision: 1724901
URL: http://svn.apache.org/viewvc?rev=1724901&view=rev
Log:
Simplify implementation of Commector.setProtocol()
- swap outer and inner if()
- consistent handling of null value
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1724901&r1=1724900&r2=1724901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sat Jan 16
00:29:12 2016
@@ -586,29 +586,23 @@ public class Connector extends Lifecycle
*/
public void setProtocol(String protocol) {
- if (AprLifecycleListener.isAprAvailable() &&
AprLifecycleListener.isAprPreferred()) {
- if ("HTTP/1.1".equals(protocol)) {
- setProtocolHandlerClassName
- ("org.apache.coyote.http11.Http11AprProtocol");
- } else if ("AJP/1.3".equals(protocol)) {
- setProtocolHandlerClassName
- ("org.apache.coyote.ajp.AjpAprProtocol");
- } else if (protocol != null) {
- setProtocolHandlerClassName(protocol);
+ boolean aprConnector = AprLifecycleListener.isAprAvailable()
+ && AprLifecycleListener.isAprPreferred();
+
+ if ("HTTP/1.1".equals(protocol) || protocol == null) {
+ if (aprConnector) {
+
setProtocolHandlerClassName("org.apache.coyote.http11.Http11AprProtocol");
} else {
- setProtocolHandlerClassName
- ("org.apache.coyote.http11.Http11AprProtocol");
+
setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");
}
- } else {
- if ("HTTP/1.1".equals(protocol)) {
- setProtocolHandlerClassName
- ("org.apache.coyote.http11.Http11NioProtocol");
- } else if ("AJP/1.3".equals(protocol)) {
- setProtocolHandlerClassName
- ("org.apache.coyote.ajp.AjpNioProtocol");
- } else if (protocol != null) {
- setProtocolHandlerClassName(protocol);
+ } else if ("AJP/1.3".equals(protocol)) {
+ if (aprConnector) {
+
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpAprProtocol");
+ } else {
+
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpNioProtocol");
}
+ } else {
+ setProtocolHandlerClassName(protocol);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
