Issue #300 - ensure Sessions are stopped before CompressionPools
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
parent
30dc103a12
commit
e67532372c
|
@ -88,7 +88,7 @@ public abstract class CompressionPool<T> extends AbstractLifeCycle
|
||||||
if (object == null)
|
if (object == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_capacity == 0)
|
if (_capacity == 0 || isStopped())
|
||||||
{
|
{
|
||||||
end(object);
|
end(object);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -400,6 +400,8 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
|
||||||
|
|
||||||
ShutdownThread.deregister(this);
|
ShutdownThread.deregister(this);
|
||||||
|
|
||||||
|
sessionTracker.stop();
|
||||||
|
extensionRegistry.stop();
|
||||||
super.doStop();
|
super.doStop();
|
||||||
|
|
||||||
if (LOG.isDebugEnabled())
|
if (LOG.isDebugEnabled())
|
||||||
|
|
|
@ -338,6 +338,14 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
|
||||||
super.doStart();
|
super.doStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doStop() throws Exception
|
||||||
|
{
|
||||||
|
sessionTracker.stop();
|
||||||
|
extensionFactory.stop();
|
||||||
|
super.doStop();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempt to find the DecoratedObjectFactory that should be used.
|
* Attempt to find the DecoratedObjectFactory that should be used.
|
||||||
* @return the DecoratedObjectFactory that should be used. (never null)
|
* @return the DecoratedObjectFactory that should be used. (never null)
|
||||||
|
|
Loading…
Reference in New Issue