[OPENMEETINGS-1610] couple of NPE are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/7a3bd07a Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7a3bd07a Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7a3bd07a Branch: refs/heads/3.2.x Commit: 7a3bd07aab928b015687b03356a34f6ead6ac5f5 Parents: 5632901 Author: Maxim Solodovnik <[email protected]> Authored: Sat Mar 25 08:15:19 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Mar 25 08:15:19 2017 +0000 ---------------------------------------------------------------------- .../openmeetings/service/quartz/scheduler/CleanupJob.java | 5 ++++- .../openmeetings/web/user/calendar/AppointmentDialog.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7a3bd07a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java index 344a0c1..400cb83 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java @@ -168,7 +168,10 @@ public class CleanupJob extends AbstractJob { processExpiringRecordings(true, (rec, days) -> { if (days < 0) { log.debug("cleanExpiredRecordings:: following recording will be deleted {}", rec); - rec.getFile(EXTENSION_MP4).delete(); + File f = rec.getFile(EXTENSION_MP4); + if (f != null && f.exists()) { + f.delete(); + } recordingDao.delete(rec); } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7a3bd07a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index ffaf4cd..976a206 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -496,7 +496,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { @Override protected void onValidate() { - if (null != end.getConvertedInput() && null != end.getConvertedInput() && end.getConvertedInput().isBefore(start.getConvertedInput())) { + if (null != start.getConvertedInput() && null != end.getConvertedInput() && end.getConvertedInput().isBefore(start.getConvertedInput())) { error(Application.getString(1592)); } }
