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

Merged branch 'jetty-9.2.x' into 'master'.

This commit is contained in:
Simone Bordet 2015-08-06 17:33:30 +02:00
parent d02a5c3c8b 020cbe1172
commit 5324d367c5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java
View File

@ -143,7 +143,6 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver
@Override
public void onError(Throwable cause)
{
LOG.warn(cause);
try
{
endpoint.onError(jsrsession,cause);
@ -226,7 +225,7 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver
{
/* Ignored, handled by TextWholeMessage */
}
@Override
public void onPing(ByteBuffer buffer)
{
@ -250,9 +249,9 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver
}
return;
}
ByteBuffer pongBuf = null;
if (BufferUtil.isEmpty(buffer))
{
pongBuf = BufferUtil.EMPTY_BUFFER;
@ -268,7 +267,7 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver
Whole<PongMessage> pongHandler = (Whole<PongMessage>)wrapper.getHandler();
pongHandler.onMessage(new JsrPongMessage(pongBuf));
}
@Override
public void setPathParameters(Map<String, String> pathParameters)
{