Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #914 from marci4/Issue900
Wrap IOException and include WebSocket
- Loading branch information
Showing
4 changed files
with
245 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
src/main/java/org/java_websocket/exceptions/WrappedIOException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright (c) 2010-2020 Nathan Rajlich | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person | ||
| * obtaining a copy of this software and associated documentation | ||
| * files (the "Software"), to deal in the Software without | ||
| * restriction, including without limitation the rights to use, | ||
| * copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following | ||
| * conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be | ||
| * included in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| * OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| package org.java_websocket.exceptions; | ||
|
|
||
| import org.java_websocket.WebSocket; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Exception to wrap an IOException and include information about the websocket which had the exception | ||
| * @since 1.4.1 | ||
| */ | ||
| public class WrappedIOException extends Exception { | ||
|
|
||
| /** | ||
| * The websocket where the IOException happened | ||
| */ | ||
| private final WebSocket connection; | ||
|
|
||
| /** | ||
| * The IOException | ||
| */ | ||
| private final IOException ioException; | ||
|
|
||
| /** | ||
| * Wrapp an IOException and include the websocket | ||
| * @param connection the websocket where the IOException happened | ||
| * @param ioException the IOException | ||
| */ | ||
| public WrappedIOException(WebSocket connection, IOException ioException) { | ||
| this.connection = connection; | ||
| this.ioException = ioException; | ||
| } | ||
|
|
||
| /** | ||
| * The websocket where the IOException happened | ||
| * @return the websocket for the wrapped IOException | ||
| */ | ||
| public WebSocket getConnection() { | ||
| return connection; | ||
| } | ||
|
|
||
| /** | ||
| * The wrapped IOException | ||
| * @return IOException which is wrapped | ||
| */ | ||
| public IOException getIOException() { | ||
| return ioException; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
src/test/java/org/java_websocket/issues/Issue900Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * Copyright (c) 2010-2020 Nathan Rajlich | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person | ||
| * obtaining a copy of this software and associated documentation | ||
| * files (the "Software"), to deal in the Software without | ||
| * restriction, including without limitation the rights to use, | ||
| * copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following | ||
| * conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be | ||
| * included in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| * OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| package org.java_websocket.issues; | ||
|
|
||
| import org.java_websocket.WebSocket; | ||
| import org.java_websocket.WebSocketImpl; | ||
| import org.java_websocket.WrappedByteChannel; | ||
| import org.java_websocket.client.WebSocketClient; | ||
| import org.java_websocket.handshake.ClientHandshake; | ||
| import org.java_websocket.handshake.ServerHandshake; | ||
| import org.java_websocket.server.WebSocketServer; | ||
| import org.java_websocket.util.SocketUtil; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.URI; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.ArrayList; | ||
| import java.util.concurrent.CountDownLatch; | ||
|
|
||
| public class Issue900Test { | ||
|
|
||
| CountDownLatch serverStartLatch = new CountDownLatch(1); | ||
| CountDownLatch closeCalledLatch = new CountDownLatch(1); | ||
|
|
||
| @Test(timeout = 2000) | ||
| public void testIssue() throws Exception { | ||
| int port = SocketUtil.getAvailablePort(); | ||
| final WebSocketClient client = new WebSocketClient(new URI("ws://localhost:" + port)) { | ||
| @Override | ||
| public void onOpen(ServerHandshake handshakedata) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onMessage(String message) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onClose(int code, String reason, boolean remote) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(Exception ex) { | ||
|
|
||
| } | ||
| }; | ||
| WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) { | ||
| @Override | ||
| public void onOpen(WebSocket conn, ClientHandshake handshake) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onClose(WebSocket conn, int code, String reason, boolean remote) { | ||
| closeCalledLatch.countDown(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onMessage(WebSocket conn, String message) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onError(WebSocket conn, Exception ex) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onStart() { | ||
| serverStartLatch.countDown(); | ||
| } | ||
| }; | ||
| new Thread(server).start(); | ||
| serverStartLatch.await(); | ||
| client.connectBlocking(); | ||
| WebSocketImpl websocketImpl = (WebSocketImpl)new ArrayList<WebSocket>(server.getConnections()).get(0); | ||
| websocketImpl.setChannel(new ExceptionThrowingByteChannel()); | ||
| server.broadcast("test"); | ||
| closeCalledLatch.await(); | ||
| } | ||
| class ExceptionThrowingByteChannel implements WrappedByteChannel { | ||
|
|
||
| @Override | ||
| public boolean isNeedWrite() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeMore() throws IOException { | ||
| throw new IOException(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isNeedRead() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public int readMore(ByteBuffer dst) throws IOException { | ||
| throw new IOException(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isBlocking() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public int read(ByteBuffer dst) throws IOException { | ||
| throw new IOException(); | ||
| } | ||
|
|
||
| @Override | ||
| public int write(ByteBuffer src) throws IOException { | ||
| throw new IOException(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isOpen() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| throw new IOException(); | ||
| } | ||
| } | ||
| } |