From 3cd4909ba344407bdabe021b815ae852fa3017a6 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 23 Apr 2013 11:56:57 -0400
Subject: [PATCH] Minor fix

---
 .../websocket/endpoint/WebSocketHandlerEndpoint.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/websocket/endpoint/WebSocketHandlerEndpoint.java b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/WebSocketHandlerEndpoint.java
index bb1048c791..be728fdcc1 100644
--- a/spring-websocket/src/main/java/org/springframework/websocket/endpoint/WebSocketHandlerEndpoint.java
+++ b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/WebSocketHandlerEndpoint.java
@@ -47,7 +47,7 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 
 	private final HandlerProvider<WebSocketHandler> handlerProvider;
 
-	private final WebSocketHandler handler;
+	private WebSocketHandler handler;
 
 	private WebSocketSession webSocketSession;
 
@@ -55,7 +55,6 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 	public WebSocketHandlerEndpoint(HandlerProvider<WebSocketHandler> handlerProvider) {
 		Assert.notNull(handlerProvider, "handlerProvider is required");
 		this.handlerProvider = handlerProvider;
-		this.handler = handlerProvider.getHandler();
 	}
 
 	@Override
@@ -64,6 +63,7 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 			logger.debug("Client connected, WebSocket session id=" + session.getId() + ", uri=" + session.getRequestURI());
 		}
 		try {
+			this.handler = handlerProvider.getHandler();
 			this.webSocketSession = new StandardWebSocketSession(session);
 
 			if (this.handler instanceof TextMessageHandler) {