[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet GenericFaceletsPortlet.java.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/07/09 12:49:40

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet
                        GenericFaceletsPortlet.java.vsl
  Log:
  remove the viewId from the session if the session is invalid
  
  Revision  Changes    Path
  1.2       +7 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet/GenericFaceletsPortlet.java.vsl
  
  Index: GenericFaceletsPortlet.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/portlet/GenericFaceletsPortlet.java.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- GenericFaceletsPortlet.java.vsl	18 Apr 2008 21:25:11 -0000	1.1
  +++ GenericFaceletsPortlet.java.vsl	9 Jul 2008 19:49:40 -0000	1.2
  @@ -182,7 +182,13 @@
   
           // This here below is what was in the MyFacesGenericPortlet implementation
           // String viewId = request.getParameter(VIEW_ID);
  -        if (viewId == null || sessionInvalidated(request))
  +        final boolean sessionInvalidated = sessionInvalidated(request);
  +        if (sessionInvalidated)
  +        {
  +            // - remove the view id so we aren't attempting to go back to it if the session is invalid
  +            request.getPortletSession().removeAttribute(VIEW_ID);
  +        }
  +        if (viewId == null || sessionInvalidated)
           {
               setPortletRequestFlag(request);
               nonFacesRequest(request,  response);