ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: fix NullPointer if no shmSize passed to POST /api/recordings/start

pull/508/head
pabloFuente 2020-06-17 20:26:28 +02:00
parent 37c05cb82a
commit 759910774f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -210,14 +210,23 @@ public class SessionRestController {
log.info("REST API: GET /api/sessions?webRtcStats={}", webRtcStats); log.info("REST API: GET /api/sessions?webRtcStats={}", webRtcStats);
Collection<Session> sessions = this.sessionManager.getSessionsWithNotActive(); Collection<Session> sessions = this.sessionManager.getSessionsWithNotActive();
log.info("1. Session collection retrieved");
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
JsonArray jsonArray = new JsonArray(); JsonArray jsonArray = new JsonArray();
sessions.forEach(s -> { sessions.forEach(s -> {
log.info("2. Gathering info for session {}", s.getSessionId());
JsonObject sessionJson = (webRtcStats == true) ? s.withStatsToJson() : s.toJson(); JsonObject sessionJson = (webRtcStats == true) ? s.withStatsToJson() : s.toJson();
jsonArray.add(sessionJson); jsonArray.add(sessionJson);
}); });
json.addProperty("numberOfElements", sessions.size()); json.addProperty("numberOfElements", sessions.size());
json.add("content", jsonArray); json.add("content", jsonArray);
log.info("3. Sending response back");
return new ResponseEntity<>(json.toString(), getResponseHeaders(), HttpStatus.OK); return new ResponseEntity<>(json.toString(), getResponseHeaders(), HttpStatus.OK);
} }
@ -460,7 +469,7 @@ public class SessionRestController {
Boolean hasVideo; Boolean hasVideo;
String recordingLayoutString; String recordingLayoutString;
String customLayout; String customLayout;
Long shmSize; Long shmSize = null;
try { try {
sessionId = (String) params.get("session"); sessionId = (String) params.get("session");
name = (String) params.get("name"); name = (String) params.get("name");
@ -470,7 +479,9 @@ public class SessionRestController {
hasVideo = (Boolean) params.get("hasVideo"); hasVideo = (Boolean) params.get("hasVideo");
recordingLayoutString = (String) params.get("recordingLayout"); recordingLayoutString = (String) params.get("recordingLayout");
customLayout = (String) params.get("customLayout"); customLayout = (String) params.get("customLayout");
shmSize = new Long(params.get("shmSize").toString()); if (params.get("shmSize") != null) {
shmSize = new Long(params.get("shmSize").toString());
}
} catch (ClassCastException | NumberFormatException e) { } catch (ClassCastException | NumberFormatException e) {
return this.generateErrorResponse("Type error in some parameter", "/api/recordings/start", return this.generateErrorResponse("Type error in some parameter", "/api/recordings/start",
HttpStatus.BAD_REQUEST); HttpStatus.BAD_REQUEST);