Author: simoneg
Date: Mon Dec 14 12:23:30 2009
New Revision: 890290

URL: http://svn.apache.org/viewvc?rev=890290&view=rev
Log:
Fix NPE in double formatter

Modified:
    
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java

Modified: 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java?rev=890290&r1=890289&r2=890290&view=diff
==============================================================================
--- 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
 (original)
+++ 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
 Mon Dec 14 12:23:30 2009
@@ -88,17 +88,19 @@
                        return formatter.parse(value).doubleValue();
                } catch (ParseException e) {
                        // Try to clean it up and do a row parse, just in case 
of currencies
-                       if (formattername.toLowerCase().startsWith("currency")) 
{
-                               value = numberTrim(value);
-                               if (value.length() > 0) {
-                                       formatter = getFormatter(null);
-                                       try {
-                                               return 
formatter.parse(value).doubleValue();
-                                       } catch (ParseException e1) {
-                                               throw new 
ConversionException(parsingError, e1);                                          
      
+                       try {
+                               if 
(formattername.toLowerCase().startsWith("currency")) {
+                                       value = numberTrim(value);
+                                       if (value.length() > 0) {
+                                               formatter = getFormatter(null);
+                                               try {
+                                                       return 
formatter.parse(value).doubleValue();
+                                               } catch (ParseException e1) {
+                                                       throw new 
ConversionException(parsingError, e1);                                          
      
+                                               }
                                        }
                                }
-                       }
+                       } catch (Exception e1) {}
                        throw new ConversionException(parsingError, e);
                }
        }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to