Author: slaurent
Date: Fri Dec 3 22:00:58 2010
New Revision: 1042022
URL: http://svn.apache.org/viewvc?rev=1042022&view=rev
Log:
bug 48973 (enhancement): Don't create SESSIONS.ser when no session exists
https://issues.apache.org/bugzilla/show_bug.cgi?id=48973
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1042022&r1=1042021&r2=1042022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 3 22:00:58 2010
@@ -207,3 +207,10 @@ PATCHES PROPOSED TO BACKPORT:
http://people.apache.org/~markt/patches/2010-12-02-bug50201-tc6.patch
+1: markt
-1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48973
+ Avoid creating file SESSIONS.ser if there's no session.
+ The patch provided by Marc Guillemot works for tc 6 & 7
+ +1: slaurent
+ -1:
+
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1042022&r1=1042021&r2=1042022&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Fri Dec
3 22:00:58 2010
@@ -366,6 +366,11 @@ public class StandardManager extends Man
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();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1042022&r1=1042021&r2=1042022&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Dec 3 22:00:58 2010
@@ -33,6 +33,7 @@
<author email="[email protected]">Tim Whittington</author>
<author email="[email protected]">Mladen Turk</author>
<author email="[email protected]">Christopher Schultz</author>
+ <author email="[email protected]">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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
