Update release notes wrt #1754, minor tweaks

FasterXML · Sep 7, 2017 · e54e9e0 · e54e9e0
1 parent 8860630
commit e54e9e0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -636,6 +636,8 @@ Bertrand Renuart (brenuart@github)
    (2.9.1)
   * Contributed #1749: StdDateFormat: performance improvement of '_format(..)' method
    (2.9.1)
+  * Contributed #1759: Reuse `Calendar` instance during parsing by `StdDateFormat`
+   (2.9.1)
 
 Kevin Gallardo (newkek@github)
   * Reported #1658: Infinite recursion when deserializing a class extending a Map,

diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -17,6 +17,8 @@ Project: jackson-databind
  (suggested by Bertrand R)
 #1749: StdDateFormat: performance improvement of '_format(..)' method 
  (contributed by Bertrand R)
+#1759: Reuse `Calendar` instance during parsing by `StdDateFormat`
+ (contributed by Bertrand R)
 - Fix `DelegatingDeserializer` constructor to pass `handledType()` (and
   not type of deserializer being delegated to!)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java b/src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java
@@ -599,6 +599,7 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition bogus)
             tz = _timezone;
         }
         Calendar cal = _getCalendar(tz);
+        cal.clear();
         String formatStr;
         if (totalLen <= 10) {
             Matcher m = PATTERN_PLAIN.matcher(dateStr);
@@ -756,8 +757,6 @@ protected Calendar _getCalendar(TimeZone tz) {
             cal.setTimeZone(tz);
         }
         cal.setLenient(isLenient());
-        cal.clear();
-
         return cal;
     }
 

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapDeserializationTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapDeserializationTest.java
@@ -223,8 +223,8 @@ public void testIntBooleanMap() throws Exception
     {
         // to get typing, must use type reference
         String JSON = "{ \"1\" : true, \"-1\" : false }";
-        Map<String,Integer> result = MAPPER.readValue
+        Map<Integer,Object> result = MAPPER.readValue
-            (JSON, new TypeReference<HashMap<Integer,Boolean>>() { });
+            (JSON, new TypeReference<HashMap<Integer,Object>>() { });
 
         assertNotNull(result);
         assertEquals(HashMap.class, result.getClass());

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/UntypedDeserializationTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/UntypedDeserializationTest.java
@@ -176,6 +176,7 @@ public void testSampleDoc() throws Exception
         // and that's all folks!
     }
 
+    @SuppressWarnings("unlikely-arg-type")
     public void testUntypedMap() throws Exception
     {
         // to get "untyped" default map-to-map, pass Object.class