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 2019/10/26 20:31:14 UTC
[tomcat] branch 7.0.x updated: Fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=63836
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b338d34 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63836
b338d34 is described below
commit b338d343c22c573d4069c172f572a7a88c7ba20b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Oct 26 22:30:21 2019 +0200
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63836
Ensure that the memory reserved for the OOME parachute is released when
the NIO endpoint is stopped.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 1 +
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index eeeb6b8..0eef5f6 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -592,6 +592,7 @@ public class NioEndpoint extends AbstractEndpoint<NioChannel> {
nioChannels.clear();
processorCache.clear();
shutdownExecutor();
+ oomParachuteData = null;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a1cf0a4..d459c50 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,6 +98,10 @@
Ensure that only a full token is matched and that the match is case
insensitive. (markt)
</fix>
+ <fix>
+ <bug>63836</bug>: Ensure that the memory reserved for the OOME parachute
+ is released when the NIO endpoint is stopped. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org