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

Issue #3479 - code cleanups 

Signed-off-by: lachan-roberts <lachlan@webtide.com>
This commit is contained in:
lachan-roberts 2019-04-11 13:10:28 +10:00 committed by Greg Wilkins
parent 0bd1f3918d
commit e09df1fe6d
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java
View File

@ -26,11 +26,10 @@ package org.eclipse.jetty.websocket.api;
public class WebSocketAdapter implements WebSocketListener
{
private volatile Session session;
private RemoteEndpoint remote;
public RemoteEndpoint getRemote()
{
return remote;
return session.getRemote();
}
public Session getSession()
@ -66,7 +65,6 @@ public class WebSocketAdapter implements WebSocketListener
public void onWebSocketConnect(Session sess)
{
this.session = sess;
this.remote = sess.getRemote();
}
@Override

2
jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java
View File

@ -27,5 +27,5 @@ package org.eclipse.jetty.websocket.api;
public enum WebSocketBehavior
{
CLIENT,
SERVER;
SERVER
}

2
jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
View File

@ -134,7 +134,7 @@ public class JettyWebSocketFrameHandlerFactory extends ContainerLifeCycle
MethodHandle frameHandle = metadata.getFrameHandle();
MethodHandle pingHandle = metadata.getPingHandle();
MethodHandle pongHandle = metadata.getPongHandle();
BatchMode batchMode = metadata.getBatchMode(); // TODO: what if we're not annotating, who else sets this
BatchMode batchMode = metadata.getBatchMode();
openHandle = bindTo(openHandle, endpointInstance);
closeHandle = bindTo(closeHandle, endpointInstance);