cvs commit: xml-xalan/src/org/apache/xalan/xpath XNodeSet.java

[sboag]

sboag       99/12/13 10:39:22

  Modified:    src/org/apache/xalan/xpath XNodeSet.java
  Log:
  Trim whitespace before conversion to number in getNumberFromNode 
(#PDIK4DASEE).
  
  Revision  Changes    Path
  1.5       +16 -16    xml-xalan/src/org/apache/xalan/xpath/XNodeSet.java
  
  Index: XNodeSet.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/XNodeSet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XNodeSet.java     1999/11/29 06:25:32     1.4
  +++ XNodeSet.java     1999/12/13 18:39:22     1.5
  @@ -119,24 +119,24 @@
     {
       double result;
       String s =  XMLParserLiaisonDefault.getNodeData(n);
  -      if(null == s) 
  -        result = 0.0;
  -      else
  +    if(null == s) 
  +      result = 0.0;
  +    else
  +    {
  +      try 
  +      {
  +        /**
  +        * TODO: Adjust this for locale.
  +        */
  +        NumberFormat formatter = NumberFormat.getNumberInstance();
  +        result = formatter.parse(s.trim()).doubleValue();
  +        // result = Double.valueOf(s).doubleValue();
  +      }
  +      catch (ParseException e) 
         {
  -        try 
  -        {
  -          /**
  -          * TODO: Adjust this for locale.
  -          */
  -          NumberFormat formatter = NumberFormat.getNumberInstance();
  -          result = formatter.parse(s).doubleValue();
  -          // result = Double.valueOf(s).doubleValue();
  -        }
  -        catch (ParseException e) 
  -        {
  -          result = 0.0;
  -        }
  +        result = 0.0;
         }
  +    }
       return result;
     }