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

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

  User: cwbrandon
  Date: 08/05/15 07:19:35

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/utils
                        MessagePhaseListener.java.vsl
  Log:
  rename trinidad RequestContext to requestContext (to avoid context name collision)
  
  Revision  Changes    Path
  1.5       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/MessagePhaseListener.java.vsl
  
  Index: MessagePhaseListener.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/MessagePhaseListener.java.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- MessagePhaseListener.java.vsl	14 May 2008 22:22:12 -0000	1.4
  +++ MessagePhaseListener.java.vsl	15 May 2008 14:19:34 -0000	1.5
  @@ -53,8 +53,8 @@
               }
           }
   #if ($standalone)
  -        org.apache.myfaces.trinidad.context.RequestContext context = org.apache.myfaces.trinidad.context.RequestContext.getCurrentInstance();
  -        final Object form =  context != null ? context.getPageFlowScope().get("$actionFormKey") : null;
  +        org.apache.myfaces.trinidad.context.RequestContext requestContext = org.apache.myfaces.trinidad.context.RequestContext.getCurrentInstance();
  +        final Object form =  requestContext != null ? requestContext.getPageFlowScope().get("$actionFormKey") : null;
   #else
           final Object form = context != null ? context.getApplication().getVariableResolver().resolveVariable(context, "$actionFormKey") : null;
   #end