From 9320eed9565d912f75301985da810467c7b956e4 Mon Sep 17 00:00:00 2001 From: zhangzq7 Date: Fri, 28 Oct 2022 09:11:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=AD=A4=E5=A4=84=E5=88=A4?= =?UTF-8?q?=E7=A9=BA=E6=B2=A1=E6=9C=89=E6=84=8F=E4=B9=89=E5=90=A7=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/fastjson/serializer/CalendarCodec.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/fastjson/serializer/CalendarCodec.java b/src/main/java/com/alibaba/fastjson/serializer/CalendarCodec.java index 6ae90ceff2..da0ad1b735 100644 --- a/src/main/java/com/alibaba/fastjson/serializer/CalendarCodec.java +++ b/src/main/java/com/alibaba/fastjson/serializer/CalendarCodec.java @@ -38,9 +38,9 @@ public void write(JSONSerializer serializer, Object object, BeanContext context) } DateFormat dateFormat = new SimpleDateFormat(format); - if (dateFormat == null) { - dateFormat = new SimpleDateFormat(JSON.DEFFAULT_DATE_FORMAT, serializer.locale); - } + // if (dateFormat == null) { + // dateFormat = new SimpleDateFormat(JSON.DEFFAULT_DATE_FORMAT, serializer.locale); + // } dateFormat.setTimeZone(serializer.timeZone); String text = dateFormat.format(calendar.getTime()); out.writeString(text); From fec563a90b148043f7bb0e5ac0329a402325ed8f Mon Sep 17 00:00:00 2001 From: zhangzq7 Date: Fri, 28 Oct 2022 09:12:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/fastjson/JSONPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/fastjson/JSONPath.java b/src/main/java/com/alibaba/fastjson/JSONPath.java index a8cc592d93..aac2df86ad 100644 --- a/src/main/java/com/alibaba/fastjson/JSONPath.java +++ b/src/main/java/com/alibaba/fastjson/JSONPath.java @@ -4086,7 +4086,7 @@ protected void deepSet(final Object currentObject, final String propertyName, lo Map map = (Map) currentObject; if (map.containsKey(propertyName)) { - Object val = map.get(propertyName); + // Object val = map.get(propertyName); map.put(propertyName, value); return; }