Author: remm
Date: Wed Feb 10 15:04:23 2016
New Revision: 1729619
URL: http://svn.apache.org/viewvc?rev=1729619&view=rev
Log:
Rename aprPreferred to useAprConnector, which is more explicit [same default
value to false].
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.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=1729619&r1=1729618&r2=1729619&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Feb 10
15:04:23 2016
@@ -563,14 +563,14 @@ public class Connector extends Lifecycle
*/
public String getProtocol() {
if
(("org.apache.coyote.http11.Http11NioProtocol".equals(getProtocolHandlerClassName())
&&
- (!AprLifecycleListener.isAprAvailable() ||
!AprLifecycleListener.isAprPreferred())) ||
+ (!AprLifecycleListener.isAprAvailable() ||
!AprLifecycleListener.getUseAprConnector())) ||
"org.apache.coyote.http11.Http11AprProtocol".equals(getProtocolHandlerClassName())
&&
- AprLifecycleListener.isAprPreferred()) {
+ AprLifecycleListener.getUseAprConnector()) {
return "HTTP/1.1";
} else if
(("org.apache.coyote.ajp.AjpNioProtocol".equals(getProtocolHandlerClassName())
&&
- (!AprLifecycleListener.isAprAvailable() ||
!AprLifecycleListener.isAprPreferred())) ||
+ (!AprLifecycleListener.isAprAvailable() ||
!AprLifecycleListener.getUseAprConnector())) ||
"org.apache.coyote.ajp.AjpAprProtocol".equals(getProtocolHandlerClassName()) &&
- AprLifecycleListener.isAprPreferred()) {
+ AprLifecycleListener.getUseAprConnector()) {
return "AJP/1.3";
}
return getProtocolHandlerClassName();
@@ -585,7 +585,7 @@ public class Connector extends Lifecycle
public void setProtocol(String protocol) {
boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
- AprLifecycleListener.isAprPreferred();
+ AprLifecycleListener.getUseAprConnector();
if ("HTTP/1.1".equals(protocol) || protocol == null) {
if (aprConnector) {
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1729619&r1=1729618&r2=1729619&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed
Feb 10 15:04:23 2016
@@ -78,7 +78,7 @@ public class AprLifecycleListener
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
protected static boolean aprAvailable = false;
- protected static boolean aprPreferred = false;
+ protected static boolean useAprConnector = false;
protected static boolean fipsModeActive = false;
/**
@@ -395,14 +395,14 @@ public class AprLifecycleListener
return fipsModeActive;
}
- public void setAprPreferred(boolean aprPreferred) {
- if (aprPreferred != AprLifecycleListener.aprPreferred) {
- AprLifecycleListener.aprPreferred = aprPreferred;
+ public void setUseAprConnector(boolean useAprConnector) {
+ if (useAprConnector != AprLifecycleListener.useAprConnector) {
+ AprLifecycleListener.useAprConnector = useAprConnector;
}
}
- public static boolean isAprPreferred() {
- return aprPreferred;
+ public static boolean getUseAprConnector() {
+ return useAprConnector;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
