Skip to content

Commit b6144e5

Browse files
FlorianKirmaierrstoyanchev
authored andcommitted
Improve setting of WebSocket error status
See gh-28836
1 parent 6e6f863 commit b6144e5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractListenerWebSocketSession.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.http.server.reactive.AbstractListenerWriteProcessor;
3434
import org.springframework.lang.Nullable;
3535
import org.springframework.util.Assert;
36+
import org.springframework.util.StringUtils;
3637
import org.springframework.web.reactive.socket.CloseStatus;
3738
import org.springframework.web.reactive.socket.HandshakeInfo;
3839
import org.springframework.web.reactive.socket.WebSocketHandler;
@@ -247,7 +248,12 @@ public void onError(Throwable ex) {
247248
if (this.handlerCompletionMono != null) {
248249
this.handlerCompletionMono.onError(ex);
249250
}
250-
close(CloseStatus.SERVER_ERROR.withReason(ex.getMessage()));
251+
if(!StringUtils.hasText(ex.getMessage())) {
252+
close(CloseStatus.SERVER_ERROR);
253+
}
254+
else {
255+
close(CloseStatus.SERVER_ERROR.withReason(ex.getMessage()));
256+
}
251257
}
252258

253259
@Override

0 commit comments

Comments
 (0)