Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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.
Jump to
Jump to file
Failed to load files.
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