[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow ViewPopulator.java.vsl

[Leif J. <le...@us...>]

  User: leifj   
  Date: 07/06/10 13:14:37

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/flow
                        ViewPopulator.java.vsl
  Log:
  fall back to using session if storing in the pageFlowScope doesn\t work
  
  Revision  Changes    Path
  1.3       +6 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ViewPopulator.java.vsl
  
  Index: ViewPopulator.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ViewPopulator.java.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- ViewPopulator.java.vsl	11 Dec 2006 13:43:58 -0000	1.2
  +++ ViewPopulator.java.vsl	10 Jun 2007 20:14:37 -0000	1.3
  @@ -80,6 +80,11 @@
                       (${managedBeansPackage}.AdfFacesContextWrapper)session.getAttribute("$adfContextAttributeName");
                   adfContext = contextWrapper != null ? contextWrapper.getCurrentInstance() : null;
                   form = adfContext != null ? adfContext.getPageFlowScope().get("$view.formKey") : null;
  +                if (form == null)
  +                {
  +                    form = session.getAttribute("$view.formKey");
  +                    session.removeAttribute("$view.formKey");
  +                }
   #if ($formSerialization)
                   // - if the form is still null, see if we can get it from a serialized state
                   if (form == null)
  @@ -96,7 +101,7 @@
               else
               {
                   // - remove the ADF context in the event that its present
  -                session.removeAttribute("AndroMDAADFContext");
  +                session.removeAttribute("$adfContextAttributeName");
               }
           }
           else