Merge pull request #3288 from ZivYan/issue#3287

修复在JodaCodec中 write 指定 SerializerFeature WriteDateUseDateFormat 无效的问题 #3287
alibaba · Jun 25, 2020 · 2646f10 · 2646f10
2 parents 369dda7 + 8f73f5f
commit 2646f10
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/serializer/JodaCodec.java b/src/main/java/com/alibaba/fastjson/serializer/JodaCodec.java
@@ -441,6 +441,8 @@ public void write(JSONSerializer serializer, Object object, Object fieldName, Ty
                 if (format == null) {
                     if ((features & mask) != 0 || serializer.isEnabled(SerializerFeature.UseISO8601DateFormat)) {
                         format = formatter_iso8601_pattern;
+                    } else if (serializer.isEnabled(SerializerFeature.WriteDateUseDateFormat)) {
+                        format = JSON.DEFFAULT_DATE_FORMAT;
                     } else {
                         int millis = dateTime.getMillisOfSecond();
                         if (millis == 0) {
@@ -453,9 +455,6 @@ public void write(JSONSerializer serializer, Object object, Object fieldName, Ty
 
                 if (format != null) {
                     write(out, dateTime, format);
-                } else if (out.isEnabled(SerializerFeature.WriteDateUseDateFormat)) {
-                    //使用固定格式转化时间
-                    write(out, dateTime, JSON.DEFFAULT_DATE_FORMAT);
                 } else {
                     out.writeLong(dateTime.toDateTime(DateTimeZone.forTimeZone(JSON.defaultTimeZone)).toInstant().getMillis());
                 }