[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Gavin King]

  User: gavin   
  Date: 07/06/22 15:49:22

  Modified:    src/main/org/jboss/seam/mock  MockFacesContext.java
  Log:
  fix JBSEAM-1529
  
  Revision  Changes    Path
  1.18      +9 -3      jboss-seam/src/main/org/jboss/seam/mock/MockFacesContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockFacesContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockFacesContext.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- MockFacesContext.java	30 May 2007 00:19:13 -0000	1.17
  +++ MockFacesContext.java	22 Jun 2007 19:49:22 -0000	1.18
  @@ -29,14 +29,13 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.17 $
    */
   public class MockFacesContext extends FacesContext
   {
   
      private UIViewRoot viewRoot;// = new UIViewRoot();
   
  -   private Map<FacesMessage, String> messages = new HashMap<FacesMessage, String>();
  +   private final Map<FacesMessage, String> messages = new HashMap<FacesMessage, String>();
   
      private ExternalContext externalContext;
   
  @@ -107,7 +106,8 @@
         List list = new ArrayList();
         for (Map.Entry<FacesMessage, String> entry : messages.entrySet())
         {
  -         if (clientId.equals(entry.getValue()))
  +         String messageId = entry.getValue();
  +         if ( idsAreEqual(clientId, messageId) )
            {
               list.add(entry.getKey());
            }
  @@ -115,6 +115,12 @@
         return list.iterator();
      }
   
  +   private boolean idsAreEqual(String clientId, String messageId)
  +   {
  +      return (clientId==null && messageId==null) || 
  +            (clientId!=null && clientId.equals(messageId));
  +   }
  +
      @Override
      public RenderKit getRenderKit()
      {