From f2994e9f456ec1d1a3558a04581e8d9a51e49595 Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Thu, 15 Nov 2012 10:53:33 +0000 Subject: [PATCH] Fixed a bug which prevented datetimes to be parsed successfully. --- src/java/com/marcozanon/macaco/conversion/MDateConverter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java index ceb748c..41b7633 100644 --- a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java +++ b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java @@ -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)); -- 2.30.2