You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by an...@apache.org on 2013/11/28 14:42:57 UTC

git commit: Fixing test failures due to time differences in DateUtils seen on MacOS.

Updated Branches:
  refs/heads/master 65c6f9f25 -> f9092d691


Fixing test failures due to time differences in DateUtils seen on MacOS.

Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f9092d69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f9092d69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f9092d69

Branch: refs/heads/master
Commit: f9092d6911fe4e27e676777cfeb32fe10e26fcb5
Parents: 65c6f9f
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Thu Nov 28 14:44:52 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Thu Nov 28 14:44:52 2013 +0100

----------------------------------------------------------------------
 core/src/main/java/org/apache/metamodel/util/DateUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f9092d69/core/src/main/java/org/apache/metamodel/util/DateUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/util/DateUtils.java b/core/src/main/java/org/apache/metamodel/util/DateUtils.java
index 31af2f9..382848a 100644
--- a/core/src/main/java/org/apache/metamodel/util/DateUtils.java
+++ b/core/src/main/java/org/apache/metamodel/util/DateUtils.java
@@ -48,6 +48,7 @@ public final class DateUtils {
 		c.set(Calendar.MINUTE, 0);
 		c.set(Calendar.SECOND, 0);
 		c.set(Calendar.MILLISECOND, 0);
+		c.set(Calendar.AM_PM, 0);
 		return c.getTime();
 	}
 
@@ -58,7 +59,7 @@ public final class DateUtils {
 		c.set(Calendar.MINUTE, 0);
 		c.set(Calendar.SECOND, 0);
 		c.set(Calendar.MILLISECOND, 0);
-
+		c.set(Calendar.AM_PM, 0);
 		return c.getTime();
 	}