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

openvidu-server: ignore empty string on RecordingProperties "mediaNode" param

pull/621/head
pabloFuente 2021-04-23 10:38:23 +02:00
parent 4891dca38c
commit 635579ad75
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java
View File

@ -407,6 +407,9 @@ public class RecordingProperties {
return json; return json;
} }
/**
* @hidden
*/
public static RecordingProperties fromJson(JsonObject json) { public static RecordingProperties fromJson(JsonObject json) {
Boolean hasVideoAux = true; Boolean hasVideoAux = true;
@ -450,10 +453,15 @@ public class RecordingProperties {
} }
} }
if (json.has("mediaNode")) { if (json.has("mediaNode")) {
String mediaNodeId = null;
if (json.get("mediaNode").isJsonObject()) { if (json.get("mediaNode").isJsonObject()) {
builder.mediaNode(json.get("mediaNode").getAsJsonObject().get("id").getAsString()); mediaNodeId = json.get("mediaNode").getAsJsonObject().get("id").getAsString();
} else if (json.get("mediaNode").isJsonPrimitive()) { } else if (json.get("mediaNode").isJsonPrimitive()) {
builder.mediaNode(json.get("mediaNode").getAsString()); mediaNodeId = json.get("mediaNode").getAsString();
}
if (mediaNodeId != null && !mediaNodeId.isEmpty()) {
builder.mediaNode(mediaNodeId);
} }
} }
return builder.build(); return builder.build();

2
openvidu-server/src/main/java/io/openvidu/server/utils/RecordingUtils.java
View File

@ -12,7 +12,7 @@ public final class RecordingUtils {
public final static RecordingProperties RECORDING_PROPERTIES_WITH_MEDIA_NODE(Session session) { public final static RecordingProperties RECORDING_PROPERTIES_WITH_MEDIA_NODE(Session session) {
RecordingProperties recordingProperties = session.getSessionProperties().defaultRecordingProperties(); RecordingProperties recordingProperties = session.getSessionProperties().defaultRecordingProperties();
if (recordingProperties.mediaNode() == null || recordingProperties.mediaNode().isEmpty()) { if (recordingProperties.mediaNode() == null) {
recordingProperties = new RecordingProperties.Builder(recordingProperties) recordingProperties = new RecordingProperties.Builder(recordingProperties)
.mediaNode(session.getMediaNodeId()).build(); .mediaNode(session.getMediaNodeId()).build();
} }