From a027cb46d14abb3c34824540ef0abc3aea63a826 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 19 Sep 2019 09:44:27 +0200 Subject: [PATCH] openvidu-server: avoid NullPointerException on empty getStringParam() --- .../src/main/java/io/openvidu/server/rpc/RpcHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java index 63082466..dd823824 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java @@ -167,7 +167,7 @@ public class RpcHandler extends DefaultJsonRpcHandler { } } - public void joinRoom(RpcConnection rpcConnection, Request request) { + private void joinRoom(RpcConnection rpcConnection, Request request) { String sessionId = getStringParam(request, ProtocolElements.JOINROOM_ROOM_PARAM); String token = getStringParam(request, ProtocolElements.JOINROOM_TOKEN_PARAM); @@ -661,8 +661,10 @@ public class RpcHandler extends DefaultJsonRpcHandler { public static String getStringParam(Request request, String key) { if (request.getParams() == null || request.getParams().get(key) == null) { - throw new RuntimeException("Request element '" + key + "' is missing in method '" + request.getMethod() - + "'. CHECK THAT 'openvidu-server' AND 'openvidu-browser' SHARE THE SAME VERSION NUMBER"); + throw new RuntimeException("Request element '" + key + "' is missing in method '" + request != null + ? request.getMethod() + : "[NO REQUEST OBJECT]" + + "'. CHECK THAT 'openvidu-server' AND 'openvidu-browser' SHARE THE SAME VERSION NUMBER"); } return request.getParams().get(key).getAsString(); }