dmitri      2004/07/25 06:16:04

  Modified:    jxpath/src/java/org/apache/commons/jxpath/util
                        BasicTypeConverter.java
  Log:
  PR: 30272. Integration with ConverterUtils had a bug in it
  
  Revision  Changes    Path
  1.15      +6 -4      
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java
  
  Index: BasicTypeConverter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BasicTypeConverter.java   29 Jun 2004 21:50:02 -0000      1.14
  +++ BasicTypeConverter.java   25 Jul 2004 13:16:04 -0000      1.15
  @@ -26,6 +26,7 @@
   import java.util.Set;
   
   import org.apache.commons.beanutils.ConvertUtils;
  +import org.apache.commons.beanutils.Converter;
   import org.apache.commons.jxpath.JXPathException;
   import org.apache.commons.jxpath.NodeSet;
   import org.apache.commons.jxpath.Pointer;
  @@ -293,9 +294,10 @@
               }
           }
           
  -        if (ConvertUtils.lookup(toType) != null) {
  -                     return ConvertUtils.convert(object.toString(), toType);
  -             }
  +        Converter converter = ConvertUtils.lookup(toType);
  +        if (converter != null) {
  +            return converter.convert(toType, object);
  +        }
   
           throw new RuntimeException(
               "Cannot convert " + object.getClass() + " to " + toType);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to