Skip to content

fix when proxy tunneling failed (IOException is hidden) JDK-8173 #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marci4 merged 2 commits into from
Jun 26, 2019
Merged

fix when proxy tunneling failed (IOException is hidden) JDK-8173 #901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7afe5b
fix when proxy tunneling failed (IOException is hidden) JDK-8173620
PearSlice Jun 11, 2019
f73cca0
Merge branch 'master' into master
marci4 Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/org/java_websocket/client/WebSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Proxy;
Expand Down Expand Up @@ -480,6 +481,15 @@ public void run() {
onWebsocketError( engine, e );
engine.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
return;
} catch (InternalError e) {
// https://bugs.openjdk.java.net/browse/JDK-8173620
if (e.getCause() instanceof InvocationTargetException && e.getCause().getCause() instanceof IOException) {
IOException cause = (IOException) e.getCause().getCause();
onWebsocketError(engine, cause);
engine.closeConnection(CloseFrame.NEVER_CONNECTED, cause.getMessage());
return;
}
throw e;
Comment thread
PhilipRoman marked this conversation as resolved.
}

writeThread = new Thread( new WebsocketWriteThread(this) );
Expand Down