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

[Gavin King]

  User: gavin   
  Date: 06/10/05 15:48:14

  Modified:    src/main/org/jboss/seam/framework  ManagedObject.java
  Log:
  handle null expressions
  
  Revision  Changes    Path
  1.3       +12 -6     jboss-seam/src/main/org/jboss/seam/framework/ManagedObject.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedObject.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/ManagedObject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ManagedObject.java	5 Oct 2006 19:43:59 -0000	1.2
  +++ ManagedObject.java	5 Oct 2006 19:48:14 -0000	1.3
  @@ -71,23 +71,29 @@
            for ( Map.Entry<String, String> initializer: initialFieldValues.entrySet() )
            {
               Object value = Expressions.instance().createValueBinding( initializer.getValue() ).getValue();
  +            if ( value!=null )
  +            {
               Field field = Reflections.getField( objectClass, initializer.getKey() );
               if ( !field.isAccessible() ) field.setAccessible(true);
               Reflections.set(field, instance, value);
            }
         }
  +      }
         if (initialPropertyValues!=null)
         {
            for ( Map.Entry<String, String> initializer: initialPropertyValues.entrySet() )
            {
               ValueBinding valueBinding = Expressions.instance().createValueBinding( initializer.getValue() );
               Object value = valueBinding.getValue();
  +            if ( value!=null )
  +            {
               Method method = Reflections.getSetterMethod( objectClass, initializer.getKey() );
               if ( !method.isAccessible() ) method.setAccessible(true);
               Reflections.invoke(method, instance, value);
            }
         }
      }
  +   }
      
      public Map<String, String> getInitialFieldValues()
      {