You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2002/04/22 21:06:45 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine Turbine.java

dlr         02/04/22 12:06:45

  Modified:    src/java/org/apache/turbine Turbine.java
  Log:
  David Vandegrift <dv...@bluearc.com> points out that attempted
  removal of an attribute from an invalid session results in an
  IllegalStateException.
  
  http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html#removeAttribute(java.lang.String)
  
  Revision  Changes    Path
  1.15      +3 -4      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.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- Turbine.java	16 Apr 2002 22:07:07 -0000	1.14
  +++ Turbine.java	22 Apr 2002 19:06:45 -0000	1.15
  @@ -117,7 +117,7 @@
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
    * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
    * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
  - * @version $Id: Turbine.java,v 1.14 2002/04/16 22:07:07 kschrader Exp $
  + * @version $Id: Turbine.java,v 1.15 2002/04/22 19:06:45 dlr Exp $
    */
   public class Turbine
       extends HttpServlet
  @@ -511,10 +511,9 @@
   
               // If a module has set data.acl = null, remove acl from
               // the session.
  -            if ( data.getACL() == null )
  +            if ( data.getACL() == null && data.getSession().isValid() )
               {
  -                data.getSession().removeValue(
  -                    AccessControlList.SESSION_KEY);
  +                data.getSession().removeValue(AccessControlList.SESSION_KEY);
               }
   
               // handle a redirect request
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>