End Date Format Changes

Sunbird-Lern · Jul 22, 2019 · 65d5e57 · 65d5e57
1 parent 6d8c56f
commit 65d5e57
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...mmon/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java b/...mmon/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java
@@ -839,15 +839,17 @@ private Date getDate(String key, SimpleDateFormat format, Map<String, Object> ma
         return format.parse(format.format(new Date()));
       } else {
         if (StringUtils.isNotBlank((String) map.get(key))) {
-          Calendar cal =
-              Calendar.getInstance(
-                  TimeZone.getTimeZone(ProjectUtil.getConfigValue(JsonKey.SUNBIRD_TIMEZONE)));
-          cal.setTime(format.parse((String) map.get(key)));
+          Date d = format.parse((String) map.get(key));
           if (key.equals(END_DATE) || key.equals(ENROLLMENT_END_DATE)) {
+            Calendar cal =
+                Calendar.getInstance(
+                    TimeZone.getTimeZone(ProjectUtil.getConfigValue(JsonKey.SUNBIRD_TIMEZONE)));
+            cal.setTime(d);
             cal.set(Calendar.HOUR_OF_DAY, 23);
             cal.set(Calendar.MINUTE, 59);
+            return cal.getTime();
           }
-          return cal.getTime();
+          return d;
         } else {
           return null;
         }