cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding MultiValueJXPathBinding.java RepeaterJXPathBinding.java ValueJXPathBinding.java

[bruno]

bruno       2004/05/11 01:22:54

  Modified:    src/blocks/forms/java/org/apache/cocoon/forms/binding
                        MultiValueJXPathBinding.java
                        RepeaterJXPathBinding.java ValueJXPathBinding.java
  Log:
  set value to null if conversion is not successfull
  restores old behaviour
  
  Revision  Changes    Path
  1.4       +3 -1      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
  
  Index: MultiValueJXPathBinding.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MultiValueJXPathBinding.java      6 May 2004 14:59:44 -0000       1.3
  +++ MultiValueJXPathBinding.java      11 May 2004 08:22:54 -0000      1.4
  @@ -80,6 +80,8 @@
                           ConversionResult conversionResult = 
convertor.convertFromString((String)value, convertorLocale, null);
                           if (conversionResult.isSuccessful())
                               value = conversionResult.getResult();
  +                        else
  +                            value = null;
                       } else {
                           getLogger().warn("Convertor ignored on backend-value 
which isn't of type String.");
                       }
  
  
  
  1.9       +3 -1      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
  
  Index: RepeaterJXPathBinding.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RepeaterJXPathBinding.java        7 May 2004 16:43:42 -0000       1.8
  +++ RepeaterJXPathBinding.java        11 May 2004 08:22:54 -0000      1.9
  @@ -307,6 +307,8 @@
                                   (String)value, 
vBinding.getConvertorLocale(), null);
                           if (conversionResult.isSuccessful())
                               value = conversionResult.getResult();
  +                        else
  +                            value = null;
                       } else {
                           if (getLogger().isWarnEnabled()) {
                               getLogger().warn("Convertor ignored on 
backend-value " +
  
  
  
  1.7       +3 -1      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
  
  Index: ValueJXPathBinding.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ValueJXPathBinding.java   7 May 2004 13:42:09 -0000       1.6
  +++ ValueJXPathBinding.java   11 May 2004 08:22:54 -0000      1.7
  @@ -93,6 +93,8 @@
                   ConversionResult conversionResult = 
convertor.convertFromString((String)value, convertorLocale, null);
                   if (conversionResult.isSuccessful())
                       value = conversionResult.getResult();
  +                else
  +                    value = null;
               } else {
                   getLogger().warn("Convertor ignored on backend-value which 
isn't of type String.");
               }