From 32487e4ec6c01ba11912e9268ec6695b9c46a20f Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 15 Feb 2021 11:27:13 +0100 Subject: [PATCH] openvidu-server: fix possible JsonNullException --- .../src/main/java/io/openvidu/server/core/Token.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java index a44b9d6a..4c892f56 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java @@ -19,6 +19,7 @@ package io.openvidu.server.core; import org.apache.commons.lang3.RandomStringUtils; +import com.google.gson.JsonNull; import com.google.gson.JsonObject; import io.openvidu.java.client.ConnectionProperties; @@ -161,7 +162,11 @@ public class Token { protected JsonObject getConnectionPropertiesWithFinalJsonFormat() { JsonObject json = this.connectionProperties.toJson(this.sessionId); 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"); return json; }