From 05dc6e21aab1c597eb6e4646d8fab31d68fa63d2 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 11 Jan 2019 16:23:14 +0100 Subject: [PATCH] Rollback to default HttpSession timeout --- .../src/main/java/io/openvidu/server/OpenViduServer.java | 1 - .../src/main/java/io/openvidu/server/rpc/RpcHandler.java | 9 --------- 2 files changed, 10 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java index 1d8aec09..c0d9109d 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java +++ b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java @@ -174,7 +174,6 @@ public class OpenViduServer implements JsonRpcConfigurer { public static void main(String[] args) throws Exception { log.info("Using /dev/urandom for secure random generation"); System.setProperty("java.security.egd", "file:/dev/./urandom"); - System.setProperty("server.session.timeout", "2137483647"); SpringApplication.run(OpenViduServer.class, args); } 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 f269cfad..ab0bd7b9 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 @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.servlet.http.HttpSession; - import org.kurento.jsonrpc.DefaultJsonRpcHandler; import org.kurento.jsonrpc.Session; import org.kurento.jsonrpc.Transaction; @@ -35,7 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; -import org.springframework.web.socket.WebSocketSession; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -565,12 +562,6 @@ public class RpcHandler extends DefaultJsonRpcHandler { public void afterConnectionClosed(Session rpcSession, String status) throws Exception { log.info("After connection closed for WebSocket session: {} - Status: {}", rpcSession.getSessionId(), status); - if (rpcSession instanceof WebSocketServerSession) { - WebSocketSession wsSession = ((WebSocketServerSession) rpcSession).getWebSocketSession(); - HttpSession httpSession = (HttpSession) wsSession.getAttributes().get("httpSession"); - httpSession.invalidate(); - } - String rpcSessionId = rpcSession.getSessionId(); String message = "";