diff options
author | Joakim Erdfelt | 2014-09-22 18:18:30 +0000 |
---|---|---|
committer | Simone Bordet | 2014-09-23 09:33:44 +0000 |
commit | 65cae13b1e1be3a81ede37a4847cbc49841faef0 (patch) | |
tree | d88f2ed5139afebc03c7f06ef0be8dd03fff8ff5 | |
parent | ee0f90b6b9fc81315dfac341b363d14cad78898c (diff) | |
download | org.eclipse.jetty.project-65cae13b1e1be3a81ede37a4847cbc49841faef0.tar.gz org.eclipse.jetty.project-65cae13b1e1be3a81ede37a4847cbc49841faef0.tar.xz org.eclipse.jetty.project-65cae13b1e1be3a81ede37a4847cbc49841faef0.zip |
444748 - WebSocketClient.stop() does not unregister from ShutdownThread
+ Making (de)register smart about if wsclient is registered or not
-rw-r--r-- | jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 4a9a981620..4e535bccf0 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -264,6 +264,11 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen { if (LOG.isDebugEnabled()) LOG.debug("Stopping {}",this); + + if (ShutdownThread.isRegistered(this)) + { + ShutdownThread.deregister(this); + } if (cookieStore != null) { @@ -435,7 +440,10 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen private synchronized void initialiseClient() throws IOException { - ShutdownThread.register(this); + if (!ShutdownThread.isRegistered(this)) + { + ShutdownThread.register(this); + } if (executor == null) { |