Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

注释掉无效代码 #4310

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

注释掉无效代码 #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9320eed
注释掉无效代码，此处判空没有意义吧？
zhangzq7 Oct 28, 2022
fec563a
注释掉无效代码
zhangzq7 Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/alibaba/fastjson/JSONPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/alibaba/fastjson/serializer/CalendarCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down