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

openvidu-server: fix possible JsonNullException

pull/609/head
pabloFuente 2021-02-15 11:27:13 +01:00
parent 57233393eb
commit 32487e4ec6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openvidu-server/src/main/java/io/openvidu/server/core/Token.java
View File

@ -19,6 +19,7 @@ package io.openvidu.server.core;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.openvidu.java.client.ConnectionProperties; import io.openvidu.java.client.ConnectionProperties;
@ -161,7 +162,11 @@ public class Token {
protected JsonObject getConnectionPropertiesWithFinalJsonFormat() { protected JsonObject getConnectionPropertiesWithFinalJsonFormat() {
JsonObject json = this.connectionProperties.toJson(this.sessionId); JsonObject json = this.connectionProperties.toJson(this.sessionId);
json.remove("session"); json.remove("session");
json.add("serverData", json.get("data")); if (json.has("data") && !json.get("data").isJsonNull()) {
json.addProperty("serverData", json.get("data").getAsString());
} else {
json.add("serverData", JsonNull.INSTANCE);
}
json.remove("data"); json.remove("data");
return json; return json;
} }