Author: solomax
Date: Sat Mar 25 08:15:19 2017
New Revision: 1788646
URL: http://svn.apache.org/viewvc?rev=1788646&view=rev
Log:
[OPENMEETINGS-1610] couple of NPE are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1788646&r1=1788645&r2=1788646&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
Sat Mar 25 08:15:19 2017
@@ -168,7 +168,10 @@ public class CleanupJob extends Abstract
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);
}
});
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1788646&r1=1788645&r2=1788646&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sat Mar 25 08:15:19 2017
@@ -496,7 +496,7 @@ public class AppointmentDialog extends A
@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));
}
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1788646&r1=1788645&r2=1788646&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
Sat Mar 25 08:15:19 2017
@@ -168,7 +168,10 @@ public class CleanupJob extends Abstract
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);
}
});
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1788646&r1=1788645&r2=1788646&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sat Mar 25 08:15:19 2017
@@ -496,7 +496,7 @@ public class AppointmentDialog extends A
@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));
}
}
