You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/10/31 11:07:37 UTC
svn commit: r1767250 - in /tomcat/trunk:
java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 31 11:07:37 2016
New Revision: 1767250
URL: http://svn.apache.org/viewvc?rev=1767250&view=rev
Log:
Remove the undocumented support for using the old Connector attribute names backlog, soLinger and soTimeout that were renamed several major versions ago.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/webapps/docs/changelog.xml
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=1767250&r1=1767249&r2=1767250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Oct 31 11:07:37 2016
@@ -18,7 +18,6 @@ package org.apache.catalina.connector;
import java.net.InetAddress;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
@@ -271,15 +270,6 @@ public class Connector extends Lifecycle
protected boolean useBodyEncodingForURI = false;
- protected static final HashMap<String,String> replacements = new HashMap<>();
- static {
- replacements.put("acceptCount", "backlog");
- replacements.put("connectionLinger", "soLinger");
- replacements.put("connectionTimeout", "soTimeout");
- replacements.put("rootFile", "rootfile");
- }
-
-
// ------------------------------------------------------------- Properties
/**
@@ -292,11 +282,7 @@ public class Connector extends Lifecycle
if (protocolHandler == null) {
return null;
}
- String repl = name;
- if (replacements.get(name) != null) {
- repl = replacements.get(name);
- }
- return IntrospectionUtils.getProperty(protocolHandler, repl);
+ return IntrospectionUtils.getProperty(protocolHandler, name);
}
@@ -311,11 +297,7 @@ public class Connector extends Lifecycle
if (protocolHandler == null) {
return false;
}
- String repl = name;
- if (replacements.get(name) != null) {
- repl = replacements.get(name);
- }
- return IntrospectionUtils.setProperty(protocolHandler, repl, value);
+ return IntrospectionUtils.setProperty(protocolHandler, name, value);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1767250&r1=1767249&r2=1767250&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 31 11:07:37 2016
@@ -145,6 +145,12 @@
Correctly differentiate between sending and receiving a reset frame when
tracking the state of an HTTP/2 stream. (markt)
</fix>
+ <scode>
+ Remove the undocumented support for using the old Connector attribute
+ names <code>backlog</code>, <code>soLinger</code> and
+ <code>soTimeout</code> that were renamed several major versions ago.
+ (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org