From 11d1f111cc8ab6b6c0732a95dd6ecd5de104b058 Mon Sep 17 00:00:00 2001 From: John DeRegnaucourt Date: Sat, 7 Oct 2023 13:46:27 -0400 Subject: [PATCH] clear calendar before use --- src/main/java/com/cedarsoftware/util/SafeSimpleDateFormat.java | 1 + src/test/java/com/cedarsoftware/util/TestSimpleDateFormat.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cedarsoftware/util/SafeSimpleDateFormat.java b/src/main/java/com/cedarsoftware/util/SafeSimpleDateFormat.java index f0466f342..d0a9ee31b 100644 --- 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 index 44bd019fc..8b2754d05 100644 --- 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));