Author: simoneg
Date: Sun Jan 24 19:57:44 2010
New Revision: 902633

URL: http://svn.apache.org/viewvc?rev=902633&view=rev
Log:
Fix in date converter for corner case of milliseconds being a round hundred

Modified:
    
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
    
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java

Modified: 
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java?rev=902633&r1=902632&r2=902633&view=diff
==============================================================================
--- 
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
 (original)
+++ 
labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
 Sun Jan 24 19:57:44 2010
@@ -101,9 +101,9 @@
                StringBuilder ret = new StringBuilder(sdf.format(value));
                if (ret.substring(ret.length() - 3, 
ret.length()).equals("000")) {
                        ret.delete(ret.length() - 4, ret.length());
-               }
-               while (ret.substring(ret.length() - 2, 
ret.length()).equals("00")) {
-                       ret.delete(ret.length() - 3, ret.length());
+                       while (ret.substring(ret.length() - 2, 
ret.length()).equals("00")) {
+                               ret.delete(ret.length() - 3, ret.length());
+                       }
                }
                return ret.toString();
        }

Modified: 
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java?rev=902633&r1=902632&r2=902633&view=diff
==============================================================================
--- 
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java
 (original)
+++ 
labs/magma/trunk/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java
 Sun Jan 24 19:57:44 2010
@@ -49,7 +49,8 @@
        set3 = {"2008-02-02", "2008-02-02T00:00:00.000"},
        set4 = {"2008-02-02T15:40", "2008-02-02T15:40:00.000"},
        set5 = {"2008-02-02T15:40:10", "2008-02-02T15:40:10.000"},
-       set6 = {"2008-02-02T15:40:10.423", "2008-02-02T15:40:10.423"};
+       set6 = {"2008-02-02T15:40:10.100", "2008-02-02T15:40:10.100"},
+       set7 = {"2008-02-02T15:40:10.423", "2008-02-02T15:40:10.423"};
        
        @Theory public void convert(String[] vals) throws ParseException {
                Date d = sdf.parse(vals[1]);



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

Reply via email to