Author: markt
Date: Fri Sep 2 09:13:20 2011
New Revision: 1164421
URL: http://svn.apache.org/viewvc?rev=1164421&view=rev
Log:
Remove unused, undocumented configuration option
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 09:13:20 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1164421&r1=1164420&r2=1164421&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Fri Sep 2 09:13:20 2011
@@ -74,9 +74,6 @@ public class Http11NioProtocol extends A
// -------------------- Properties--------------------
-
- private int socketCloseDelay=-1;
-
private Http11ConnectionHandler cHandler;
// -------------------- Pool setup --------------------
@@ -125,14 +122,6 @@ public class Http11NioProtocol extends A
}
// -------------------- Tcp setup --------------------
- public int getSocketCloseDelay() {
- return socketCloseDelay;
- }
-
- public void setSocketCloseDelay( int d ) {
- socketCloseDelay=d;
- }
-
public void setOomParachute(int oomParachute) {
((NioEndpoint)endpoint).setOomParachute(oomParachute);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1164421&r1=1164420&r2=1164421&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 2 09:13:20 2011
@@ -53,7 +53,7 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
-<section name="Tomcat 7.0.22">
+<section name="Tomcat 7.0.22 (markt)">
<subsection name="Catalina">
<changelog>
<fix>
@@ -67,9 +67,15 @@
</add>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <code>Remove unused and undocumented socketCloseDelay attribute from NIO
+ connector. (markt)</code>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
- <fix>
+ <fix>
In jdbc-pool: Avoid IllegalArgumentException when setting maxActive
less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
