Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #643 - NPE in passing websocket client test.

This commit is contained in:
Simone Bordet 2016-06-23 12:59:24 +02:00
parent 0879b44d37
commit 9d9df416af
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java
View File

@ -204,13 +204,13 @@ public abstract class AbstractEventDriver extends AbstractLifeCycle implements I
{
/* TODO: provide annotation in future */
}
@Override
public void onPing(ByteBuffer buffer)
{
/* TODO: provide annotation in future */
}
@Override
public BatchMode getBatchMode()
{
@ -234,12 +234,6 @@ public abstract class AbstractEventDriver extends AbstractLifeCycle implements I
throw t;
}
}
@Override
protected void doStop() throws Exception
{
session = null;
}
protected void terminateConnection(int statusCode, String rawreason)
{
@ -252,7 +246,7 @@ public abstract class AbstractEventDriver extends AbstractLifeCycle implements I
{
TARGET_LOG.warn("Unhandled Error (closing connection)",t);
onError(t);
if (t instanceof CloseException)
{
terminateConnection(((CloseException)t).getStatusCode(),t.getClass().getSimpleName());