clear calendar before use

jdereg · Oct 7, 2023 · 11d1f11 · 11d1f11
1 parent 7dc9887
commit 11d1f11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/cedarsoftware/util/SafeSimpleDateFormat.java b/src/main/java/com/cedarsoftware/util/SafeSimpleDateFormat.java
@@ -59,6 +59,7 @@ public SafeSimpleDateFormat(String format)
         DateFormat dateFormat = getDateFormat(_format);
         // Reset for new instance
         Calendar cal = Calendar.getInstance();
+        cal.clear();
         dateFormat.setCalendar(cal);
         dateFormat.setLenient(cal.isLenient());
         dateFormat.setTimeZone(cal.getTimeZone());

diff --git a/src/test/java/com/cedarsoftware/util/TestSimpleDateFormat.java b/src/test/java/com/cedarsoftware/util/TestSimpleDateFormat.java
@@ -102,7 +102,7 @@ public void testSetCalendar() throws Exception
         cal.clear();
         cal.setTime(then);
         assertEquals(2013, cal.get(Calendar.YEAR));
-        assertEquals(2, cal.get(Calendar.MONTH));   // Sept
+        assertEquals(2, cal.get(Calendar.MONTH));   // March
         assertEquals(31, cal.get(Calendar.DAY_OF_MONTH));
         assertEquals(0, cal.get(Calendar.HOUR_OF_DAY));
         assertEquals(0, cal.get(Calendar.MINUTE));