From a4c157fc09d3169f44901ee8969f3dacc73aaccb Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 27 Jul 2020 09:22:03 +0300
Subject: [PATCH] Check for native WebSocket message

In addition to the changes in
313a7836b091d20dbb9763b3677d559fea32d13d to support passing on a
the underlying WebSocket message, this commits checks for its
availability.

Closes gh-25099
---
 .../reactive/socket/adapter/NettyWebSocketSessionSupport.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
index 5185b401c7..d331d31dc3 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
@@ -78,6 +78,9 @@ public abstract class NettyWebSocketSessionSupport<T> extends AbstractWebSocketS
 	}
 
 	protected WebSocketFrame toFrame(WebSocketMessage message) {
+		if (message.getNativeMessage() != null) {
+			return message.getNativeMessage();
+		}
 		ByteBuf byteBuf = NettyDataBufferFactory.toByteBuf(message.getPayload());
 		if (WebSocketMessage.Type.TEXT.equals(message.getType())) {
 			return new TextWebSocketFrame(byteBuf);