Author: kkolinko
Date: Tue Jan 26 05:21:39 2010
New Revision: 903083
URL: http://svn.apache.org/viewvc?rev=903083&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718
Correct file descriptor leak on context stop/reload
Patch provided by George Sexton
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=903083&r1=903082&r2=903083&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 26 05:21:39 2010
@@ -126,13 +126,6 @@
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718
- Correct file descriptor leak on context stop/reload
- Patch provided by George Sexton
- http://svn.apache.org/viewvc?rev=883130&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
Process changes for all naming contexts, not just the global one
http://svn.apache.org/viewvc?rev=883134&view=rev
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java?rev=903083&r1=903082&r2=903083&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Tue Jan 26 05:21:39 2010
@@ -707,6 +707,15 @@
public void destroy() {
if( oname != null )
Registry.getRegistry(null, null).unregisterComponent(oname);
+ if (randomIS!=null) {
+ try {
+ randomIS.close();
+ } catch (IOException ioe) {
+ log.warn("Failed to close randomIS.");
+ }
+ randomIS=null;
+ }
+
initialized=false;
oname = null;
// Don't clear log since it is required in case attributes are changed
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=903083&r1=903082&r2=903083&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 26
05:21:39 2010
@@ -35,6 +35,10 @@
<section name="Tomcat 5.5.29 (fhanik)">
<subsection name="General">
<changelog>
+ <add>
+ <bug>37847</bug>: Make location and filename of catalina.out
configurable
+ in catalina.sh. (fhanik/kkolinko)
+ </add>
<fix>
<bug>47712</bug>: Loading tcnative was broken in 5.5.28. (rjung)
</fix>
@@ -62,10 +66,6 @@
Align server.xml installed by the Windows installer with the one
bundled in zip/tar.gz archives. (kkolinko)
</fix>
- <add>
- <bug>37847</bug>: Make location and filename of catalina.out
configurable
- in catalina.sh. (fhanik/kkolinko)
- </add>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -95,6 +95,10 @@
old method. Patch provided by Christopher Schultz. (markt)
</fix>
<fix>
+ <bug>47718</bug>: Fix file descriptor leak on context stop/reload.
Patch
+ provided by George Sexton. (markt)
+ </fix>
+ <fix>
<bug>47826</bug>: Correct error in debug message in
org.apache.catalina.Bootstrap (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
