Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718

Correct file descriptor leak on context reload/stop
Patch provided by George Sexton

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@883130 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 58bcb6c..a0249f4 100644 (file)
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -709,6 +709,15 @@ public abstract class ManagerBase implements Manager, MBeanRegistration {
     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;
     }