компонент DateCmp исправлена ошибка NullPointerException

4878c009 · Raimbek Egemberdiev · 9bdab9d6 · 4878c009
Commit 4878c009 authored Nov 16, 2016 by Raimbek Egemberdiev
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

src/main/java/kz/arta/synergy/api/asforms/converter/components/DateConverter.java ...nergy/api/asforms/converter/components/DateConverter.java +10 -3

No files found.
--- a/src/main/java/kz/arta/synergy/api/asforms/converter/components/DateConverter.java
+++ b/src/main/java/kz/arta/synergy/api/asforms/converter/components/DateConverter.java
@@ -23,10 +23,17 @@ public class DateConverter extends AbstractComponentConverter {
        if (field.getType().isAssignableFrom(Date.class)) {
            Date date = (Date) field.get(asForm);
+            if (date == null) {
+                return asFormData;
+            }
            String dateFormat = getDateFormat(annotation);
-            String dateValue = new SimpleDateFormat(dateFormat).format(date);
+            try {
-            asFormData.setValue(dateValue);
+                String dateValue = new SimpleDateFormat(dateFormat).format(date);
-            asFormData.setKey(dateValue);
+                asFormData.setValue(dateValue);
+                asFormData.setKey(dateValue);
+            } catch (Exception ex) {
+                return asFormData;
+            }
        } else {
            asFormData.setKey(String.valueOf(field.get(asForm)));
        }