Author: markt
Date: Wed Apr 13 18:51:58 2016
New Revision: 1738989
URL: http://svn.apache.org/viewvc?rev=1738989&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58970
Fix a connection counting bug in the NIO connector that meant some dropped
connections were not removed from the current connection count.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 13 18:51:58 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1738989&r1=1738988&r2=1738989&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
Apr 13 18:51:58 2016
@@ -625,8 +625,14 @@ public class NioEndpoint extends Abstrac
} else {
final SelectionKey key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
try {
- boolean cancel = false;
- if (key != null) {
+ if (key == null) {
+ // The key was cancelled (e.g. due to socket closure)
+ // and removed from the selector while it was being
+ // processed. Count down the connections at this point
+ // since it won't have been counted down when the
socket
+ // closed.
+
socket.socketWrapper.getEndpoint().countDownConnection();
+ } else {
final NioSocketWrapper socketWrapper =
(NioSocketWrapper) key.attachment();
if (socketWrapper != null) {
//we are registering the key to start with, reset
the fairness counter.
@@ -634,12 +640,9 @@ public class NioEndpoint extends Abstrac
socketWrapper.interestOps(ops);
key.interestOps(ops);
} else {
- cancel = true;
+ socket.getPoller().cancelledKey(key);
}
- } else {
- cancel = true;
}
- if (cancel) socket.getPoller().cancelledKey(key);
} catch (CancelledKeyException ckx) {
try {
socket.getPoller().cancelledKey(key);
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738989&r1=1738988&r2=1738989&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Apr 13 18:51:58 2016
@@ -48,6 +48,11 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>58970</bug>: Fix a connection counting bug in the NIO connector
+ that meant some dropped connections were not removed from the current
+ connection count. (markt)
+ </fix>
+ <fix>
<bug>59206</bug>: Ensure NPE will not be thrown by
<code>o.a.tomcat.util.file.ConfigFileLoader</code> when
<code>catalina.base</code> is not specified. (violetagg)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
