Update release notes wrt #948, convert Math.pow() to simpler switch

Author: cowtowncoder

release-notes/CREDITS

@@ -338,5 +338,7 @@ Andreas Pieber (anpieber@github)
    (2.6.3)
 
 Jesse Wilson (swankjesse@github)
+  * Contributed #948: Support leap seconds, any number of millisecond digits for ISO-8601 Dates.
+   (2.6.3)
   * Contributed #949: Report the offending substring when number parsing fails
    (2.6.3)

release-notes/VERSION

@@ -9,7 +9,9 @@ Project: jackson-databind
 #819: Add support for setting `FormatFeature` via `ObjectReader`, `ObjectWriter`
 #918: Add `MapperFeature.ALLOW_EXPLICIT_PROPERTY_RENAMING`
  (contributed by David H)
-#933:Close some gaps to allow using the tryToResolveUnresolved flows
+#933: Close some gaps to allow using the tryToResolveUnresolved flows
+#948: Support leap seconds, any number of millisecond digits for ISO-8601 Dates.
+ (contributed by Jesse W)
 
 2.6.3 (not yet released)
 

src/main/java/com/fasterxml/jackson/databind/util/ISO8601Utils.java

@@ -207,7 +207,17 @@ public static Date parse(String date, ParsePosition pos) throws ParseException {
                             int endOffset = indexOfNonDigit(date, offset + 1); // assume at least one digit
                             int parseEndOffset = Math.min(endOffset, offset + 3); // parse up to 3 digits
                             int fraction = parseInt(date, offset, parseEndOffset);
-                            milliseconds = (int) (Math.pow(10, 3 - (parseEndOffset - offset)) * fraction);
+                            // compensate for "missing" digits
+                            switch (parseEndOffset - offset) { // number of digits parsed
+                            case 2:
+                                milliseconds = fraction * 10;
+                                break;
+                            case 1:
+                                milliseconds = fraction * 100;
+                                break;
+                            default:
+                                milliseconds = fraction;
+                            }
                             offset = endOffset;
                         }
                     }
@@ -357,4 +367,44 @@ private static int indexOfNonDigit(String string, int offset) {
         }
         return string.length();
     }
+
+    public static void main(String[] args)
+    {
+        final int REPS = 250000;
+        while (true) {
+            long start = System.currentTimeMillis();
+            int resp = test1(REPS, 3);
+            long msecs = System.currentTimeMillis() - start;
+            System.out.println("Pow ("+resp+") -> "+msecs+" ms");
+
+            start = System.currentTimeMillis();
+            resp = test2(REPS, 3);
+            msecs = System.currentTimeMillis() - start;
+            System.out.println("Iter ("+resp+") -> "+msecs+" ms");
+        }
+    }
+
+    static int test1(int reps, int pow)
+    {
+        int resp = 3;
+        while (--reps >= 0) {
+            resp = (int) Math.pow(10, pow);
+        }
+        return resp;
+    }
+
+    static int test2(int reps, int pow)
+    {
+        int resp = 3;
+        while (--reps >= 0) {
+            resp = 10;
+            int p = pow;
+
+            while (--p > 0) {
+                resp *= 10;
+            }
+        }
+        return resp;
+    }
 }
+