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

[Norman Richards]

  User: nrichards
  Date: 07/07/27 16:47:53

  Modified:    src/main/org/jboss/seam/faces  UiComponent.java
  Log:
  JBSEAM-1730
  
  Revision  Changes    Path
  1.6       +7 -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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UiComponent.java	10 Jul 2007 09:37:10 -0000	1.5
  +++ UiComponent.java	27 Jul 2007 20:47:52 -0000	1.6
  @@ -47,7 +47,13 @@
               if ( !(key instanceof String) ) return null;
               try
               {
  -               return FacesContext.getCurrentInstance().getViewRoot().findComponent( (String) key );
  +                FacesContext context = FacesContext.getCurrentInstance();
  +
  +                if (context == null) {
  +                    return null;
  +                }
  +
  +                return context.getViewRoot().findComponent( (String) key );
               }
               catch (IllegalArgumentException iae)
               {