diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy index eeacac67e0b479cd290f82df5da117b114386433..89ec529cbc9c1ed684e0aeb58dbe6f5cf685eefd 100755 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy +++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy @@ -1984,17 +1984,11 @@ class ApiController { // END - backward compatibility } - // Do we have a publish status? If none, set default value. - String force = params.force - if (StringUtils.isEmpty(force)) { - force = "false" - } - //Execute code specific for this call Map<String, String> metaParams = ParamsProcessorUtil.processMetaParam(params) if ( !metaParams.empty ) { //Proceed with the update - meetingService.updateRecordings(recordIdList, metaParams, force.toBoolean()); + meetingService.updateRecordings(recordIdList, metaParams); } withFormat { xml { diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java index 3cad660f2e26251f83485ecd85accf25c5bcb993..42357fb707fc619bd8f81c8aceb0ec45f9446983 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java @@ -485,8 +485,8 @@ public class MeetingService implements MessageListener { } } - public void updateRecordings(List<String> idList, Map<String, String> metaParams, boolean force) { - recordingService.updateMetaParams(idList, metaParams, force); + public void updateRecordings(List<String> idList, Map<String, String> metaParams) { + recordingService.updateMetaParams(idList, metaParams); } public void processRecording(String meetingId) { diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java index 67ad6c6fdc139154f33877b8e3cfe277464b90d2..8f0a2162e24dd4f131289823d0d2db775a964f72 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java @@ -397,10 +397,6 @@ public class RecordingService { } public void updateMetaParams(List<String> recordIDs, Map<String,String> metaParams) { - updateMetaParams(recordIDs, metaParams, false); - } - - public void updateMetaParams(List<String> recordIDs, Map<String,String> metaParams, boolean force) { // Define the directories used to lookup the recording List<String> states = new ArrayList<String>(); @@ -422,20 +418,13 @@ public class RecordingService { Recording rec = getRecordingInfo(recFile); if (rec != null) { for (Map.Entry<String,String> meta : metaParams.entrySet()) { - if ( rec.containsMetadata(meta.getKey()) ) { - // The meta parameter already exists - if ( !"".equals(meta.getValue()) || !force ) { - // update it - rec.updateMetadata(meta.getKey(), meta.getValue()); - } else { - // delete it - rec.deleteMetadata(meta.getKey()); - } + if ( !"".equals(meta.getValue()) ) { + // As it has a value, if the meta parameter exists update it, otherwise add it + rec.updateMetadata(meta.getKey(), meta.getValue()); } else { - // The meta parameter doesn't exist - if ( force ) { - // but force is set to true, then add it - rec.updateMetadata(meta.getKey(), meta.getValue()); + // As it doesn't have a value, if it exists delete it + if ( rec.containsMetadata(meta.getKey()) ) { + rec.deleteMetadata(meta.getKey()); } } }