Fixed a bug which prevented datetimes to be parsed successfully.
authorMarco Zanon <info@marcozanon.com>
Thu, 15 Nov 2012 10:53:33 +0000 (10:53 +0000)
committerMarco Zanon <info@marcozanon.com>
Thu, 15 Nov 2012 10:53:33 +0000 (10:53 +0000)
3.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java

index ceb748c9daf734154151edf05bd046c8092870f8..41b763331db1a0a3b2d7ef505c4e080a9c9daeaf 100644 (file)
@@ -169,6 +169,9 @@ public class MDateConverter extends MObject {
         c2.set(Calendar.YEAR, c1.get(Calendar.YEAR));
         c2.set(Calendar.MONTH, c1.get(Calendar.MONTH));
         c2.set(Calendar.DAY_OF_MONTH, c1.get(Calendar.DAY_OF_MONTH));
+        c2.set(Calendar.HOUR_OF_DAY, c1.get(Calendar.HOUR_OF_DAY));
+        c2.set(Calendar.MINUTE, c1.get(Calendar.MINUTE));
+        c2.set(Calendar.SECOND, c1.get(Calendar.SECOND));
         Date d2 = c2.getTime();
         if (!x.equals(sdf.format(d2))) {
             throw new MFormatConversionException(String.format("Invalid 'x' or parsing: %s (input format: %s).", x, inputDateFormat));