dlr 02/04/22 14:54:35
Modified: src/java/org/apache/turbine Turbine.java
Log:
Using change for attempted removal of an attribute from an invalid
session suggested by David Vandegrift <[EMAIL PROTECTED]>. What
I tried used a Catalina-internal API which is hidden behind Catalina's
HttpSessionFacade class (read: not part of the Servlet API). It's
either try/catch or call 3 methods which return longs. :-\
Revision Changes Path
1.16 +10 -3 jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- Turbine.java 22 Apr 2002 19:06:45 -0000 1.15
+++ Turbine.java 22 Apr 2002 21:54:35 -0000 1.16
@@ -117,7 +117,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.15 2002/04/22 19:06:45 dlr Exp $
+ * @version $Id: Turbine.java,v 1.16 2002/04/22 21:54:35 dlr Exp $
*/
public class Turbine
extends HttpServlet
@@ -511,9 +511,16 @@
// If a module has set data.acl = null, remove acl from
// the session.
- if ( data.getACL() == null && data.getSession().isValid() )
+ if ( data.getACL() == null )
{
- data.getSession().removeValue(AccessControlList.SESSION_KEY);
+ try
+ {
+ data.getSession().removeValue(
+ AccessControlList.SESSION_KEY);
+ }
+ catch (IllegalStateException ignored)
+ {
+ }
}
// handle a redirect request
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
