Revision: 4583
Author: seba.wagner
Date: Thu Nov 17 08:19:12 2011
Log: Fixes issue 1566
http://code.google.com/p/openmeetings/source/detail?r=4583
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Thu Nov 17 08:19:12 2011
@@ -443,11 +443,15 @@
/**
* @param fileExplorerItemId
*/
- public void deleteFlvRecording(Long flvRecordingId) {
+ public boolean deleteFlvRecording(Long flvRecordingId) {
try {
FlvRecording fId =
this.getFlvRecordingById(flvRecordingId);
+ if (fId == null) {
+ return false;
+ }
+
fId.setDeleted("true");
fId.setUpdated(new Date());
@@ -458,10 +462,14 @@
em.merge(fId);
}
}
+
+ return true;
} catch (Exception ex2) {
log.error("[deleteFileExplorerItem]: ",ex2);
}
+
+ return false;
}
/**
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Thu Nov 17 08:19:12 2011
@@ -97,7 +97,7 @@
}
}
- public void deleteFlvRecording(String SID, Long flvRecordingId)
+ public boolean deleteFlvRecording(String SID, Long flvRecordingId)
throws AxisFault {
try {
@@ -105,14 +105,15 @@
Long user_level =
userManagement.getUserLevelByID(users_id);
if
(authLevelManagement.checkWebServiceLevel(user_level)) {
-
flvRecordingDao.deleteFlvRecording(flvRecordingId);
-
- }
- // return null;
+ return
flvRecordingDao.deleteFlvRecording(flvRecordingId);
+ }
+
} catch (Exception err) {
log.error("[deleteFlvRecording] ", err);
throw new AxisFault(err.getMessage());
}
+
+ return false;
}
public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
Thu Sep 1 07:57:50 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
Thu Nov 17 08:19:12 2011
@@ -52,9 +52,9 @@
return this.geRoomServiceProxy().getRoomsPublic(SID,
roomtypes_id);
}
- public void deleteFlvRecording(String SID, Long flvRecordingId)
+ public boolean deleteFlvRecording(String SID, Long flvRecordingId)
throws AxisFault {
- this.geRoomServiceProxy().deleteFlvRecording(SID,
flvRecordingId);
+ return this.geRoomServiceProxy().deleteFlvRecording(SID,
flvRecordingId);
}
public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
