Merge pull request bigbluebutton#7800 from pedrobmarin/caption-file-c…

…ontent-type Fix on getting caption file content type
Konard · Jul 17, 2019 · bd3ac15 · bd3ac15
2 parents d5b1d6a + 517e252
commit bd3ac15
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...n-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy b/...n-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy
@@ -9,7 +9,6 @@ import org.bigbluebutton.api.ApiErrors
 import org.bigbluebutton.api.ApiParams
 import org.apache.commons.lang3.StringUtils
 import org.json.JSONArray
-import org.springframework.web.multipart.commons.CommonsMultipartFile
 import org.apache.commons.lang.LocaleUtils
 
 class RecordingController {
@@ -184,11 +183,7 @@ class RecordingController {
 
     def uploadedCaptionsFile = request.getFile('file')
     if (uploadedCaptionsFile && !uploadedCaptionsFile.empty) {
-      CommonsMultipartFile contentType = uploadedCaptionsFile.contentType
-      def fileContentType = null
-      if (contentType != null) {
-        fileContentType = contentType.getContentType()
-      }
+      def fileContentType = uploadedCaptionsFile.getContentType()
       log.debug("Captions content type: " + fileContentType)
       def origFilename = uploadedCaptionsFile.getOriginalFilename()
       def trackId = recordId + "-" + System.currentTimeMillis()