Uncomment assertion for context propagation

Closes gh-342
spring-projects · Apr 12, 2022 · dbba8b1 · dbba8b1
1 parent 218b16e
commit dbba8b1
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...phql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java b/...phql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java
@@ -365,12 +365,9 @@ public void afterHandshake(
 		public Closeable restoreThreadLocalValue(WebSocketSession session) {
 			if (this.accessor != null) {
 				Map<String, Object> valuesMap = (Map<String, Object>) session.getAttributes().get(SAVED_CONTEXT_KEY);
-				// Uncomment when Boot is updated to use HandshakeInterceptor
-				// Assert.state(valuesMap != null, "No context");
-				if (valuesMap != null) {
-					this.accessor.restoreValues(valuesMap);
-					return () -> this.accessor.resetValues(valuesMap);
-				}
+				Assert.state(valuesMap != null, "No ThreadLocal context in WebSocketSession attributes");
+				this.accessor.restoreValues(valuesMap);
+				return () -> this.accessor.resetValues(valuesMap);
 			}
 			return () -> {};
 		}