Skip to content

Fix : WebSocketServer crashes when overridden methods throw Exceptions #1481 #1494

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix : WebSocketServer crashes when overridden methods throw Exceptions #1481 #1494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 45 additions & 6 deletions src/main/java/org/java_websocket/server/WebSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,16 @@ private boolean doSetupSelectorAndServerThread() {
for (WebSocketWorker ex : decoders) {
ex.start();
}
onStart();
try {
onStart();
} catch (Exception e) {
log.error("Exception in onStart", e);
try {
onError(null, e);
} catch (Exception ex2) {
log.error("Exception in onError while handling onStart", ex2);
}
}
} catch (IOException ex) {
handleFatal(null, ex);
return false;
Expand Down Expand Up @@ -735,7 +744,11 @@ private void handleIOException(SelectionKey key, WebSocket conn, IOException ex)

private void handleFatal(WebSocket conn, Exception e) {
log.error("Shutdown due to fatal error", e);
onError(conn, e);
try {
onError(conn, e);
} catch (Exception ex2) {
log.error("Exception in onError while handling fatal error", ex2);
}

String causeMessage = e.getCause() != null ? " caused by " + e.getCause().getClass().getName() : "";
String errorMessage = "Got error on server side: " + e.getClass().getName() + causeMessage;
Expand All @@ -744,7 +757,11 @@ private void handleFatal(WebSocket conn, Exception e) {
} catch (InterruptedException e1) {
Thread.currentThread().interrupt();
log.error("Interrupt during stop", e);
onError(null, e1);
try {
onError(null, e1);
} catch (Exception ex2) {
log.error("Exception in onError while handling interrupt during stop", ex2);
}
}

//Shutting down WebSocketWorkers, see #222
Expand Down Expand Up @@ -772,7 +789,16 @@ public final void onWebsocketMessage(WebSocket conn, ByteBuffer blob) {
@Override
public final void onWebsocketOpen(WebSocket conn, Handshakedata handshake) {
if (addConnection(conn)) {
onOpen(conn, (ClientHandshake) handshake);
try {
onOpen(conn, (ClientHandshake) handshake);
} catch (Exception e) {
log.error("Exception in onOpen", e);
try {
onError(conn, e);
} catch (Exception ex2) {
log.error("Exception in onError while handling onOpen", ex2);
}
}
}
}

Expand All @@ -781,7 +807,16 @@ public final void onWebsocketClose(WebSocket conn, int code, String reason, bool
selector.wakeup();
try {
if (removeConnection(conn)) {
onClose(conn, code, reason, remote);
try {
onClose(conn, code, reason, remote);
} catch (Exception e) {
log.error("Exception in onClose", e);
try {
onError(conn, e);
} catch (Exception ex2) {
log.error("Exception in onError while handling onClose", ex2);
}
}
}
} finally {
try {
Expand Down Expand Up @@ -841,7 +876,11 @@ protected boolean addConnection(WebSocket ws) {

@Override
public final void onWebsocketError(WebSocket conn, Exception ex) {
onError(conn, ex);
try {
onError(conn, ex);
} catch (Exception ex2) {
log.error("Exception in onError", ex2);
}
}

@Override
Expand Down