improved jdk8 java.time support

alibaba · May 2, 2022 · cd3c2de · cd3c2de
1 parent c63866e
commit cd3c2de
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/Jdk8DateCodec.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/Jdk8DateCodec.java
@@ -174,7 +174,6 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName, S
                 return (T) period;
             } else if (type == Duration.class) {
                 Duration duration = Duration.parse(text);
-
                 return (T) duration;
             } else if (type == Instant.class) {
                 boolean digit = true;
@@ -249,6 +248,12 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName, S
                     return (T) Instant.ofEpochSecond(
                             TypeUtils.longExtractValue((Number) epochSecond));
                 }
+            } else if (type == Duration.class) {
+                Long seconds = object.getLong("seconds");
+                if (seconds != null) {
+                    long nanos = object.getLongValue("nano");
+                    return (T) Duration.ofSeconds(seconds, nanos);
+                }
             }
         } else {
             throw new UnsupportedOperationException();