root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Wrap Jetty WebSocketException 

Issue: SPR-14267
This commit is contained in:
Rossen Stoyanchev 2016-05-18 11:05:09 -04:00
parent 1e003a1c90
commit 3fb58cda8e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -24,7 +24,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.jetty.websocket.api.RemoteEndpoint;
import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -185,22 +187,31 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
@Override @Override
protected void sendTextMessage(TextMessage message) throws IOException { protected void sendTextMessage(TextMessage message) throws IOException {
getNativeSession().getRemote().sendString(message.getPayload()); getRemoteEndpoint().sendString(message.getPayload());
} }
@Override @Override
protected void sendBinaryMessage(BinaryMessage message) throws IOException { protected void sendBinaryMessage(BinaryMessage message) throws IOException {
getNativeSession().getRemote().sendBytes(message.getPayload()); getRemoteEndpoint().sendBytes(message.getPayload());
} }
@Override @Override
protected void sendPingMessage(PingMessage message) throws IOException { protected void sendPingMessage(PingMessage message) throws IOException {
getNativeSession().getRemote().sendPing(message.getPayload()); getRemoteEndpoint().sendPing(message.getPayload());
} }
@Override @Override
protected void sendPongMessage(PongMessage message) throws IOException { protected void sendPongMessage(PongMessage message) throws IOException {
getNativeSession().getRemote().sendPong(message.getPayload()); getRemoteEndpoint().sendPong(message.getPayload());
}
private RemoteEndpoint getRemoteEndpoint() throws IOException {
try {
return getNativeSession().getRemote();
}
catch (WebSocketException ex) {
throw new IOException("Unable to obtain RemoteEndpoint in session=" + getId(), ex);
}
} }
@Override @Override