Fix API calls.

bigbluebutton · Nov 2, 2018 · a52e907 · a52e907
1 parent 2ca7481
commit a52e907
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
@@ -199,7 +199,7 @@ public static Map<String, String> processMetaParam(Map<String, String> params) {
                 // Need to lowercase to maintain backward compatibility with
                 // 0.81
                 String metaName = removeMetaString(entry.getKey()).toLowerCase();
-                metas.put(metaName, params.get(entry.getValue()));
+                metas.put(metaName, entry.getValue());
             }
         }
 

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -261,7 +261,6 @@ public Boolean isBreakout() {
 	  return isBreakout;
 	}
 
-
     public void setHaveRecordingMarks(boolean marks) {
         haveRecordingMarks = marks;
     }

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/RedisStorageService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/RedisStorageService.java
@@ -24,21 +24,23 @@ public void stop() {
   public void start() {
     // Set the name of this client to be able to distinguish when doing
     // CLIENT LIST on redis-cli
-    redisPool = new JedisPool(new GenericObjectPoolConfig(), host, port, Protocol.DEFAULT_TIMEOUT, null,
+    redisPool = new JedisPool(new GenericObjectPoolConfig<Object>(), host, port, Protocol.DEFAULT_TIMEOUT, null,
       Protocol.DEFAULT_DATABASE, "BbbRed5AppsPub");
   }
 
   public void recordMeetingInfo(String meetingId, Map<String, String> info) {
     Jedis jedis = redisPool.getResource();
     try {
-      for (String key : info.keySet()) {
-        log.debug("Storing metadata {} = {}", key, info.get(key));
+      if (log.isDebugEnabled()) {
+        for (Map.Entry<String,String> entry : info.entrySet()) {
+          log.debug("Storing metadata {} = {}", entry.getKey(), entry.getValue());
+        }
       }
 
       log.debug("Saving metadata in {}", meetingId);
       jedis.hmset("meeting:info:" + meetingId, info);
     } catch (Exception e) {
-      log.warn("Cannot record the info meeting: {}" + meetingId, e);
+      log.warn("Cannot record the info meeting: {}", meetingId, e);
     } finally {
       jedis.close();
     }
@@ -50,7 +52,7 @@ public void recordBreakoutInfo(String meetingId, Map<String, String> breakoutInf
       log.debug("Saving breakout metadata in {}", meetingId);
       jedis.hmset("meeting:breakout:" + meetingId, breakoutInfo);
     } catch (Exception e) {
-      log.warn("Cannot record the info meeting:" + meetingId, e);
+      log.warn("Cannot record the info meeting: {}", meetingId, e);
     } finally {
       jedis.close();
     }

diff --git a/...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -2009,7 +2009,7 @@ class ApiController {
     def filenameExt = FilenameUtils.getExtension(presFilename);
     String presentationDir = presentationService.getPresentationDir()
     def presId = Util.generatePresentationId(presFilename)
-    File uploadDir = Util.createPresentationDirectory(meetingId, presentationDir, presId)
+    File uploadDir = presDownloadService.createPresentationDirectory(meetingId, presentationDir, presId)
     if (uploadDir != null) {
       def newFilename = Util.createNewFilename(presId, filenameExt)
       def pres = new File(uploadDir.absolutePath + File.separatorChar + newFilename);