From 01b366bc1918d1278f72077cf77af681f2f60e99 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 9 Oct 2014 11:15:06 -0700 Subject: [PATCH] GUAC-798: Call init() of superclass in WebSocket implementations. --- .../basic/websocket/jetty/AuthenticatingWebSocketServlet.java | 1 + .../basic/websocket/tomcat/AuthenticatingWebSocketServlet.java | 1 + 2 files changed, 2 insertions(+) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty/AuthenticatingWebSocketServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty/AuthenticatingWebSocketServlet.java index 93f908c7e..9792597a3 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty/AuthenticatingWebSocketServlet.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty/AuthenticatingWebSocketServlet.java @@ -78,6 +78,7 @@ public abstract class AuthenticatingWebSocketServlet extends WebSocketServlet { @Override public void init() throws ServletException { + super.init(); auth_servlet.init(); } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/AuthenticatingWebSocketServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/AuthenticatingWebSocketServlet.java index ac4b109ba..7642263ec 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/AuthenticatingWebSocketServlet.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/AuthenticatingWebSocketServlet.java @@ -79,6 +79,7 @@ public abstract class AuthenticatingWebSocketServlet extends WebSocketServlet { @Override public void init() throws ServletException { + super.init(); auth_servlet.init(); }