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

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

  User: cwbrandon
  Date: 08/07/03 08:01:40

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/utils
                        MessagePhaseListener.java.vsl
  Log:
  prevent null pointers (JSF-41)
  
  Revision  Changes    Path
  1.8       +29 -23    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.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- MessagePhaseListener.java.vsl	28 May 2008 19:04:29 -0000	1.7
  +++ MessagePhaseListener.java.vsl	3 Jul 2008 15:01:36 -0000	1.8
  @@ -24,8 +24,12 @@
           for (final java.util.Iterator iterator = context.getClientIdsWithMessages(); iterator.hasNext();)
           {
               final String clientId = (String) iterator.next();
  +            if (clientId != null)
  +            {
               final javax.faces.component.UIComponent component = root.findComponent(clientId);
               final java.util.Collection<Object> arguments = new java.util.ArrayList<Object>();
  +                if (component != null)
  +                {
               for (final java.util.Iterator iterator2 = component.getChildren().iterator(); iterator2.hasNext();)
               {
                   final Object child = iterator2.next();
  @@ -41,6 +45,7 @@
                       }
                   }
               }
  +               }
               for (final java.util.Iterator iterator2 = context.getMessages(clientId); iterator2.hasNext();)
               {
                   final javax.faces.application.FacesMessage facesMessage = (javax.faces.application.FacesMessage)iterator2.next();
  @@ -52,6 +57,7 @@
                   }
               }
           }
  +        }
   #if ($standalone)
           org.apache.myfaces.trinidad.context.RequestContext requestContext = org.apache.myfaces.trinidad.context.RequestContext.getCurrentInstance();
           final Object form =  requestContext != null ? requestContext.getPageFlowScope().get("$actionFormKey") : null;