[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter ...

[Peter Muir]

  User: pmuir   
  Date: 07/07/02 08:26:07

  Modified:    ui/src/main/java/org/jboss/seam/ui/converter 
                        EnumConverter.java
  Log:
  RESOLVED - issue JBSEAM-1595: EnumConverter NPE when missing value
  
  Revision  Changes    Path
  1.4       +3 -3      jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EnumConverter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EnumConverter.java	20 Jun 2007 02:46:16 -0000	1.3
  +++ EnumConverter.java	2 Jul 2007 12:26:07 -0000	1.4
  @@ -14,8 +14,8 @@
      {
         ValueExpression expr = comp.getValueExpression("value");
   
  -      Class enumType = expr.getType(context.getELContext());
  -      if (enumType.isEnum())
  +      Class enumType = expr == null ? null : expr.getType(context.getELContext());
  +      if (enumType != null && enumType.isEnum())
         {
            return Enum.valueOf(enumType, value);
         }
  @@ -27,7 +27,7 @@
               {
                  UIComponent c = (UIComponent) child;
                  expr = c.getValueExpression("value");
  -               Object val = expr.getValue(context.getELContext());
  +               Object val = expr == null ? null : expr.getValue(context.getELContext());
                  if (val == null)
                  {
                     throw new ConverterException("Cannot get items");