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

[Peter Muir]

  User: pmuir   
  Date: 07/11/14 07:48:57

  Modified:    src/main/org/jboss/seam/faces  UiComponent.java
  Log:
  JBSEAM-2055
  
  Revision  Changes    Path
  1.7       +9 -1      jboss-seam/src/main/org/jboss/seam/faces/UiComponent.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UiComponent.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/UiComponent.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- UiComponent.java	27 Jul 2007 20:47:52 -0000	1.6
  +++ UiComponent.java	14 Nov 2007 12:48:57 -0000	1.7
  @@ -8,6 +8,7 @@
   import java.util.Set;
   
   import javax.faces.component.UIComponent;
  +import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   
   import org.jboss.seam.annotations.Install;
  @@ -53,7 +54,14 @@
                       return null;
                   }
   
  -                return context.getViewRoot().findComponent( (String) key );
  +                UIViewRoot viewRoot = context.getViewRoot();
  +                
  +                if (viewRoot == null)
  +                {
  +                   return null;
  +                }
  +
  +                return viewRoot.findComponent( (String) key );
               }
               catch (IllegalArgumentException iae)
               {