Author: markt
Date: Tue Nov 9 15:31:19 2010
New Revision: 1033024
URL: http://svn.apache.org/viewvc?rev=1033024&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50232
Remove dependency between StoreBase and PersistentManager and associated code
clean-up.
Patch provided by Tiago Batista.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StoreBase.java?rev=1033024&r1=1033023&r2=1033024&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StoreBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StoreBase.java Tue Nov 9
15:31:19 2010
@@ -167,7 +167,15 @@ public abstract class StoreBase extends
if (manager.getContainer().getLogger().isDebugEnabled()) {
manager.getContainer().getLogger().debug(getStoreName()+
": processExpires expire store session " + keys[i] );
}
- if ( ( (PersistentManagerBase) manager).isLoaded( keys[i] )) {
+ boolean isLoaded = false;
+ try {
+ if (manager.findSession(keys[i]) != null) {
+ isLoaded = true;
+ }
+ } catch (IOException ioe) {
+ // Ignore - session will be expired
+ }
+ if (isLoaded) {
// recycle old backup session
session.recycle();
} else {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033024&r1=1033023&r2=1033024&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 9 15:31:19 2010
@@ -116,6 +116,11 @@
Correct infinite loop if
<code>ServletRequest.startAsync(ServletRequest,
ServletResponse)</code> was called. (markt)
</fix>
+ <fix>
+ <bug>50232</bug>: Remove dependency between StoreBase and
+ PersistentManager and associated code clean-up. Patch provided by
+ Tiago Batista. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
