Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve setting of WebSocket error status

Browse Source 
See gh-28836
This commit is contained in:
floriankirmaier
2022-07-18 16:34:32 +02:00
committed by Rossen Stoyanchev
parent 6e6f8637d1
commit b6144e5682
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import org.springframework.http.server.reactive.AbstractListenerReadPublisher;
import org.springframework.http.server.reactive.AbstractListenerWriteProcessor;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.reactive.socket.CloseStatus;
import org.springframework.web.reactive.socket.HandshakeInfo;
import org.springframework.web.reactive.socket.WebSocketHandler;
@@ -247,7 +248,12 @@ public abstract class AbstractListenerWebSocketSession<T> extends AbstractWebSoc
if (this.handlerCompletionMono != null) {
this.handlerCompletionMono.onError(ex);
}
close(CloseStatus.SERVER_ERROR.withReason(ex.getMessage()));
if(!StringUtils.hasText(ex.getMessage())) {
close(CloseStatus.SERVER_ERROR);
}
else {
close(CloseStatus.SERVER_ERROR.withReason(ex.getMessage()));
}
}
@Override