This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push: new 82dc5f0 Remove unused code. Fix deprecation warning. 82dc5f0 is described below commit 82dc5f0fb958f167e6f0aa6de6f1cd815e8e1578 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Nov 12 09:01:08 2019 +0000 Remove unused code. Fix deprecation warning. --- .../apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java index 1b0494f..9974638 100644 --- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java +++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java @@ -41,8 +41,7 @@ import org.apache.tomcat.websocket.WsRemoteEndpointImplBase; */ public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase { - private static final StringManager sm = - StringManager.getManager(Constants.PACKAGE_NAME); + private static final StringManager sm = StringManager.getManager(WsRemoteEndpointImplServer.class); private final Log log = LogFactory.getLog(WsRemoteEndpointImplServer.class); // must not be static private static final Queue<OnResultRunnable> onResultRunnables = @@ -55,7 +54,6 @@ public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase { private volatile ByteBuffer[] buffers = null; private volatile long timeoutExpiry = -1; - private volatile boolean close; public WsRemoteEndpointImplServer(AbstractServletOutputStream sos, @@ -100,9 +98,6 @@ public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase { if (complete) { wsWriteTimeout.unregister(this); clearHandler(null, useDispatch); - if (close) { - close(); - } break; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org