You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by kp...@apache.org on 2003/05/13 09:04:16 UTC

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation I18nTransformer.java

kpiroumian    2003/05/13 00:04:16

  Modified:    src/java/org/apache/cocoon/transformation
                        I18nTransformer.java
  Log:
  Avoid NPE in case of wrong fraction digits format.Thanks to Michael enke
  
  Revision  Changes    Path
  1.5       +12 -11    cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- I18nTransformer.java	19 Mar 2003 15:42:14 -0000	1.4
  +++ I18nTransformer.java	13 May 2003 07:04:16 -0000	1.5
  @@ -635,7 +635,7 @@
       /**
        * This configuration parameter specifies the default locale to be used.
        */
  -    public static final String I18N_LOCALE		= "locale";
  +    public static final String I18N_LOCALE      = "locale";
   
   
       /**
  @@ -1851,15 +1851,16 @@
           if (value == null) return "";
           // type
           String type = (String)params.get(I18N_TYPE_ATTRIBUTE);
  -        // fraction-digits
  -        int fractionDigits = -1;
  -        try {
  -            fractionDigits = Integer.parseInt((String)
  -                    params.get(I18N_FRACTION_DIGITS_ATTRIBUTE));
  -        }
  -        catch(NumberFormatException nfe) {
  -            getLogger().warn("Error in number format", nfe);
  -        }
  +
  +         // fraction-digits
  +         int fractionDigits = -1;
  +         try {
  +             String fd = (String)params.get(I18N_FRACTION_DIGITS_ATTRIBUTE);
  +             if (fd != null) 
  +                 fractionDigits = Integer.parseInt(fd);
  +         } catch (NumberFormatException nfe) {
  +             getLogger().warn("Error in number format with fraction-digits", nfe);
  +         }
   
           // parsed number
           Number numberValue = null;