bug 48973 (enhancement): Don't create SESSIONS.ser when no session exists

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

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

diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java
index 158ba19..d754548 100644 (file)
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -366,6 +366,11 @@ public class StandardManager extends ManagerBase {
 
         if (log.isDebugEnabled())
             log.debug("Unloading persisted sessions");
+        
+        if (sessions.isEmpty()) {
+            log.debug("No persisted sessions to unload");
+            return; // nothing to do
+        }
 
         // Open an output stream to the specified pathname, if any
         File file = file();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index edc2639..febf50b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -33,6 +33,7 @@
     <author email="timw@apache.org">Tim Whittington</author>    
     <author email="mturk@apache.org">Mladen Turk</author>
     <author email="schultz@apache.org">Christopher Schultz</author>
+    <author email="slaurent@apache.org">Sylvain Laurent</author>
     <title>Changelog</title>
   </properties>
 
@@ -41,6 +42,11 @@
 <section name="Tomcat 7.0.6 (markt)">
   <subsection name="Catalina">
     <changelog>
+      <add>
+        <bug>48973</bug>: Avoid creating a SESSIONS.ser file when stopping an 
+        application if there's no session. Patch provided by Marc Guillemot.
+        (slaurent)
+      </add>
       <update>
         <bug>48692</bug>: Provide option to parse
         <code>application/x-www-form-urlencoded</code> PUT requests. (schultz)