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

JSONObject.toJSON problem #4374

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ public Object getPropertyValueDirect(Object object) throws InvocationTargetExcep

public Object getPropertyValue(Object object) throws InvocationTargetException, IllegalAccessException {
Object propertyValue = fieldInfo.get(object);
if (propertyValue == null) {
JSONField jsonField = fieldInfo.getAnnotation();
if (jsonField != null && !"".equals(jsonField.defaultValue())) {
propertyValue = jsonField.defaultValue();
}
}
if (format != null && propertyValue != null) {
if (fieldInfo.fieldClass == java.util.Date.class || fieldInfo.fieldClass == java.sql.Date.class) {
SimpleDateFormat dateFormat = new SimpleDateFormat(format, JSON.defaultLocale);
Expand Down