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;
             }
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);