Tighten up exception handling strategy

WebSocketHandler implementations:
- methods must deal with exceptions locally
- uncaught runtime exceptions are handled by ending the session
- transport errors (websocket engine) are passed into handleError

WebSocketSession methods may raise IOException

SockJS implementation of WebSocketHandler:
- delegate SockJS transport errors into handleError
- stop runtime exceptions from user WebSocketHandler and end session

SockJsServce and TransportHandlers:
- raise IOException or TransportErrorException

HandshakeHandler:
- raise IOException

spring-websocket/src/main/java/org/springframework/sockjs/AbstractSockJsSession.java

@@ -16,6 +16,7 @@
 
 package org.springframework.sockjs;
 
+import java.io.IOException;
 import java.net.URI;
 
 import org.apache.commons.logging.Log;
@@ -121,10 +122,15 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 		this.timeLastActive = System.currentTimeMillis();
 	}
 
-	public void delegateConnectionEstablished() throws Exception {
+	public void delegateConnectionEstablished() {
 		this.state = State.OPEN;
 		initHandler();
-		this.handler.afterConnectionEstablished(this);
+		try {
+			this.handler.afterConnectionEstablished(this);
+		}
+		catch (Throwable ex) {
+			tryCloseWithError(ex, null);
+		}
 	}
 
 	private void initHandler() {
@@ -133,14 +139,61 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 		this.handler = (TextMessageHandler) webSocketHandler;
 	}
 
-	public void delegateMessages(String[] messages) throws Exception {
-		for (String message : messages) {
-			this.handler.handleTextMessage(new TextMessage(message), this);
+	/**
+	 * Close due to unhandled runtime error from WebSocketHandler.
+	 * @param closeStatus TODO
+	 */
+	private void tryCloseWithError(Throwable ex, CloseStatus closeStatus) {
+		logger.error("Unhandled error for " + this, ex);
+		try {
+			closeStatus = (closeStatus != null) ? closeStatus : CloseStatus.SERVER_ERROR;
+			close(closeStatus);
+		}
+		catch (Throwable t) {
+			destroyHandler();
 		}
 	}
 
-	public void delegateError(Throwable ex) throws Exception {
-		this.handler.handleError(ex, this);
+	private void destroyHandler() {
+		try {
+			if (this.handler != null) {
+				this.handlerProvider.destroy(this.handler);
+			}
+		}
+		catch (Throwable t) {
+			logger.warn("Error while destroying handler", t);
+		}
+		finally {
+			this.handler = null;
+		}
+	}
+
+	/**
+	 * Close due to error arising from SockJS transport handling.
+	 */
+	protected void tryCloseWithSockJsTransportError(Throwable ex, CloseStatus closeStatus) {
+		delegateError(ex);
+		tryCloseWithError(ex, closeStatus);
+	}
+
+	public void delegateMessages(String[] messages) {
+		try {
+			for (String message : messages) {
+				this.handler.handleTextMessage(new TextMessage(message), this);
+			}
+		}
+		catch (Throwable ex) {
+			tryCloseWithError(ex, null);
+		}
+	}
+
+	public void delegateError(Throwable ex) {
+		try {
+			this.handler.handleTransportError(ex, this);
+		}
+		catch (Throwable t) {
+			tryCloseWithError(t, null);
+		}
 	}
 
 	/**
@@ -149,7 +202,7 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 	 * {@link TextMessageHandler}. This is in contrast to {@link #close()} that pro-actively
 	 * closes the connection.
 	 */
-	public final void delegateConnectionClosed(CloseStatus status) throws Exception {
+	public final void delegateConnectionClosed(CloseStatus status) {
 		if (!isClosed()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug(this + " was closed, " + status);
@@ -159,7 +212,12 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 			}
 			finally {
 				this.state = State.CLOSED;
-				this.handler.afterConnectionClosed(status, this);
+				try {
+					this.handler.afterConnectionClosed(status, this);
+				}
+				finally {
+					destroyHandler();
+				}
 			}
 		}
 	}
@@ -171,7 +229,7 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 	 * {@inheritDoc}
 	 * <p>Performs cleanup and notifies the {@link SockJsHandler}.
 	 */
-	public final void close() throws Exception {
+	public final void close() throws IOException {
 		close(CloseStatus.NORMAL);
 	}
 
@@ -179,7 +237,7 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 	 * {@inheritDoc}
 	 * <p>Performs cleanup and notifies the {@link SockJsHandler}.
 	 */
-	public final void close(CloseStatus status) throws Exception {
+	public final void close(CloseStatus status) throws IOException {
 		if (!isClosed()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Closing " + this + ", " + status);
@@ -193,13 +251,13 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
 					this.handler.afterConnectionClosed(status, this);
 				}
 				finally {
-					this.handlerProvider.destroy(this.handler);
+					destroyHandler();
 				}
 			}
 		}
 	}
 
-	protected abstract void closeInternal(CloseStatus status) throws Exception;
+	protected abstract void closeInternal(CloseStatus status) throws IOException;
 
 
 	@Override

spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSockJsSession.java

@@ -56,13 +56,13 @@ public abstract class AbstractServerSockJsSession extends AbstractSockJsSession
 		return this.sockJsConfig;
 	}
 
-	public final synchronized void sendMessage(WebSocketMessage message) throws Exception {
-		Assert.isTrue(!isClosed(), "Cannot send a message, session has been closed");
+	public final synchronized void sendMessage(WebSocketMessage message) throws IOException {
+		Assert.isTrue(!isClosed(), "Cannot send a message when session is closed");
 		Assert.isInstanceOf(TextMessage.class, message, "Expected text message: " + message);
 		sendMessageInternal(((TextMessage) message).getPayload());
 	}
 
-	protected abstract void sendMessageInternal(String message) throws Exception;
+	protected abstract void sendMessageInternal(String message) throws IOException;
 
 
 	@Override
@@ -72,7 +72,7 @@ public abstract class AbstractServerSockJsSession extends AbstractSockJsSession
 	}
 
 	@Override
-	public final synchronized void closeInternal(CloseStatus status) throws Exception {
+	public final synchronized void closeInternal(CloseStatus status) throws IOException {
 		if (isActive()) {
 			// TODO: deliver messages "in flight" before sending close frame
 			try {
@@ -89,13 +89,13 @@ public abstract class AbstractServerSockJsSession extends AbstractSockJsSession
 	}
 
 	// TODO: close status/reason
-	protected abstract void disconnect(CloseStatus status) throws Exception;
+	protected abstract void disconnect(CloseStatus status) throws IOException;
 
 	/**
 	 * For internal use within a TransportHandler and the (TransportHandler-specific)
 	 * session sub-class.
 	 */
-	protected void writeFrame(SockJsFrame frame) throws Exception {
+	protected void writeFrame(SockJsFrame frame) throws IOException {
 		if (logger.isTraceEnabled()) {
 			logger.trace("Preparing to write " + frame);
 		}
@@ -115,7 +115,7 @@ public abstract class AbstractServerSockJsSession extends AbstractSockJsSession
 		catch (Throwable ex) {
 			logger.warn("Terminating connection due to failure to send message: " + ex.getMessage());
 			close();
-			throw new NestedSockJsRuntimeException("Failed to write frame " + frame, ex);
+			throw new NestedSockJsRuntimeException("Failed to write " + frame, ex);
 		}
 	}
 
@@ -140,7 +140,7 @@ public abstract class AbstractServerSockJsSession extends AbstractSockJsSession
 				try {
 					sendHeartbeat();
 				}
-				catch (Exception e) {
+				catch (Throwable t) {
 					// ignore
 				}
 			}

spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractSockJsService.java

@@ -201,7 +201,8 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
 	 * @throws Exception
 	 */
 	public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
-			String sockJsPath, HandlerProvider<WebSocketHandler> handler) throws Exception {
+			String sockJsPath, HandlerProvider<WebSocketHandler> handler)
+					throws IOException, TransportErrorException {
 
 		logger.debug(request.getMethod() + " [" + sockJsPath + "]");
 
@@ -255,10 +256,11 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
 	}
 
 	protected abstract void handleRawWebSocketRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler) throws Exception;
+			HandlerProvider<WebSocketHandler> handler) throws IOException;
 
 	protected abstract void handleTransportRequest(ServerHttpRequest request, ServerHttpResponse response,
-			String sessionId, TransportType transportType, HandlerProvider<WebSocketHandler> handler) throws Exception;
+			String sessionId, TransportType transportType, HandlerProvider<WebSocketHandler> handler)
+					throws IOException, TransportErrorException;
 
 
 	protected boolean validateRequest(String serverId, String sessionId, String transport) {
@@ -321,7 +323,7 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
 
 	private interface SockJsRequestHandler {
 
-		void handle(ServerHttpRequest request, ServerHttpResponse response) throws Exception;
+		void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException;
 	}
 
 	private static final Random random = new Random();
@@ -331,7 +333,7 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
 		private static final String INFO_CONTENT =
 				"{\"entropy\":%s,\"origins\":[\"*:*\"],\"cookie_needed\":%s,\"websocket\":%s}";
 
-		public void handle(ServerHttpRequest request, ServerHttpResponse response) throws Exception {
+		public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
 
 			if (HttpMethod.GET.equals(request.getMethod())) {
 
@@ -376,7 +378,7 @@ public abstract class AbstractSockJsService implements SockJsService, SockJsConf
 		        "</body>\n" +
 		        "</html>";
 
-		public void handle(ServerHttpRequest request, ServerHttpResponse response) throws Exception {
+		public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
 
 			if (!HttpMethod.GET.equals(request.getMethod())) {
 				sendMethodNotAllowed(response, Arrays.asList(HttpMethod.GET));

spring-websocket/src/main/java/org/springframework/sockjs/server/SockJsService.java

@@ -16,6 +16,8 @@
 
 package org.springframework.sockjs.server;
 
+import java.io.IOException;
+
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.websocket.HandlerProvider;
@@ -31,6 +33,6 @@ public interface SockJsService {
 
 
 	void handleRequest(ServerHttpRequest request, ServerHttpResponse response, String sockJsPath,
-			HandlerProvider<WebSocketHandler> handler) throws Exception;
+			HandlerProvider<WebSocketHandler> handler) throws IOException, TransportErrorException;
 
 }

spring-websocket/src/main/java/org/springframework/sockjs/server/TransportErrorException.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.sockjs.server;
+
+import org.springframework.core.NestedRuntimeException;
+import org.springframework.websocket.WebSocketHandler;
+
+
+/**
+ * Raised when a TransportHandler fails during request processing.
+ *
+ * <p>If the underlying exception occurs while sending messages to the client,
+ * the session will have been closed and the {@link WebSocketHandler} notified.
+ *
+ * <p>If the underlying exception occurs while processing an incoming HTTP request
+ * including posted messages, the session will remain open. Only the incoming
+ * request is rejected.
+ *
+ * @author Rossen Stoyanchev
+ * @since 4.0
+ */
+@SuppressWarnings("serial")
+public class TransportErrorException extends NestedRuntimeException {
+
+	private final String sockJsSessionId;
+
+	public TransportErrorException(String msg, Throwable cause, String sockJsSessionId) {
+		super(msg, cause);
+		this.sockJsSessionId = sockJsSessionId;
+	}
+
+	public String getSockJsSessionId() {
+		return sockJsSessionId;
+	}
+
+	@Override
+	public String getMessage() {
+		return "Transport error for SockJS session id=" + this.sockJsSessionId + ", " + super.getMessage();
+	}
+
+}

spring-websocket/src/main/java/org/springframework/sockjs/server/TransportHandler.java

@@ -32,6 +32,6 @@ public interface TransportHandler {
 	TransportType getTransportType();
 
 	void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler, AbstractSockJsSession session) throws Exception;
+			HandlerProvider<WebSocketHandler> handler, AbstractSockJsSession session) throws TransportErrorException;
 
 }

spring-websocket/src/main/java/org/springframework/sockjs/server/support/DefaultSockJsService.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sockjs.server.support;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,6 +38,7 @@ import org.springframework.sockjs.SockJsSessionFactory;
 import org.springframework.sockjs.server.AbstractSockJsService;
 import org.springframework.sockjs.server.ConfigurableTransportHandler;
 import org.springframework.sockjs.server.SockJsService;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportHandler;
 import org.springframework.sockjs.server.TransportType;
 import org.springframework.sockjs.server.transport.EventSourceTransportHandler;
@@ -140,7 +142,7 @@ public class DefaultSockJsService extends AbstractSockJsService {
 
 	@Override
 	protected void handleRawWebSocketRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler) throws Exception {
+			HandlerProvider<WebSocketHandler> handler) throws IOException {
 
 		if (isWebSocketEnabled()) {
 			TransportHandler transportHandler = this.transportHandlers.get(TransportType.WEBSOCKET);
@@ -157,7 +159,8 @@ public class DefaultSockJsService extends AbstractSockJsService {
 
 	@Override
 	protected void handleTransportRequest(ServerHttpRequest request, ServerHttpResponse response,
-			String sessionId, TransportType transportType, HandlerProvider<WebSocketHandler> handler) throws Exception {
+			String sessionId, TransportType transportType, HandlerProvider<WebSocketHandler> handler)
+					throws IOException, TransportErrorException {
 
 		TransportHandler transportHandler = this.transportHandlers.get(transportType);
 

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpReceivingTransportHandler.java

@@ -26,6 +26,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.AbstractSockJsSession;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportHandler;
 import org.springframework.websocket.HandlerProvider;
 import org.springframework.websocket.WebSocketHandler;
@@ -54,7 +55,8 @@ public abstract class AbstractHttpReceivingTransportHandler implements Transport
 
 	@Override
 	public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> webSocketHandler, AbstractSockJsSession session) throws Exception {
+			HandlerProvider<WebSocketHandler> webSocketHandler, AbstractSockJsSession session)
+					throws TransportErrorException {
 
 		if (session == null) {
 			response.setStatusCode(HttpStatus.NOT_FOUND);
@@ -65,20 +67,22 @@ public abstract class AbstractHttpReceivingTransportHandler implements Transport
 	}
 
 	protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractSockJsSession session) throws Exception {
+			AbstractSockJsSession session) throws TransportErrorException {
 
 		String[] messages = null;
 		try {
 			messages = readMessages(request);
 		}
 		catch (JsonMappingException ex) {
-			response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
-			response.getBody().write("Payload expected.".getBytes("UTF-8"));
+			sendInternalServerError(response, "Payload expected.", session.getId());
 			return;
 		}
 		catch (IOException ex) {
-			response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
-			response.getBody().write("Broken JSON encoding.".getBytes("UTF-8"));
+			sendInternalServerError(response, "Broken JSON encoding.", session.getId());
+			return;
+		}
+		catch (Throwable t) {
+			sendInternalServerError(response, "Failed to process messages", session.getId());
 			return;
 		}
 
@@ -92,6 +96,18 @@ public abstract class AbstractHttpReceivingTransportHandler implements Transport
 		response.getHeaders().setContentType(new MediaType("text", "plain", Charset.forName("UTF-8")));
 	}
 
+	protected void sendInternalServerError(ServerHttpResponse response, String error,
+			String sessionId) throws TransportErrorException {
+
+		try {
+			response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
+			response.getBody().write(error.getBytes("UTF-8"));
+		}
+		catch (Throwable t) {
+			throw new TransportErrorException("Failed to send error message to client", t, sessionId);
+		}
+	}
+
 	protected abstract String[] readMessages(ServerHttpRequest request) throws IOException;
 
 	protected abstract HttpStatus getResponseStatus();

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java

@@ -27,6 +27,7 @@ import org.springframework.sockjs.SockJsSessionFactory;
 import org.springframework.sockjs.server.ConfigurableTransportHandler;
 import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.sockjs.server.SockJsFrame;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
 import org.springframework.websocket.HandlerProvider;
 import org.springframework.websocket.WebSocketHandler;
@@ -56,7 +57,8 @@ public abstract class AbstractHttpSendingTransportHandler
 
 	@Override
 	public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> webSocketHandler, AbstractSockJsSession session) throws Exception {
+			HandlerProvider<WebSocketHandler> webSocketHandler, AbstractSockJsSession session)
+					throws TransportErrorException {
 
 		// Set content type before writing
 		response.getHeaders().setContentType(getContentType());
@@ -66,30 +68,28 @@ public abstract class AbstractHttpSendingTransportHandler
 	}
 
 	protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession httpServerSession) throws Exception, IOException {
+			AbstractHttpServerSockJsSession httpServerSession) throws TransportErrorException {
 
 		if (httpServerSession.isNew()) {
-			handleNewSession(request, response, httpServerSession);
+			logger.debug("Opening " + getTransportType() + " connection");
+			httpServerSession.setInitialRequest(request, response, getFrameFormat(request));
 		}
-		else if (httpServerSession.isActive()) {
-			logger.debug("another " + getTransportType() + " connection still open: " + httpServerSession);
-			httpServerSession.writeFrame(response, SockJsFrame.closeFrameAnotherConnectionOpen());
+		else if (!httpServerSession.isActive()) {
+			logger.debug("starting " + getTransportType() + " async request");
+			httpServerSession.setLongPollingRequest(request, response, getFrameFormat(request));
 		}
 		else {
-			logger.debug("starting " + getTransportType() + " async request");
-			httpServerSession.setCurrentRequest(request, response, getFrameFormat(request));
+			try {
+				logger.debug("another " + getTransportType() + " connection still open: " + httpServerSession);
+				SockJsFrame closeFrame = SockJsFrame.closeFrameAnotherConnectionOpen();
+				response.getBody().write(getFrameFormat(request).format(closeFrame).getContentBytes());
+			}
+			catch (IOException e) {
+				throw new TransportErrorException("Failed to send SockJS close frame", e, httpServerSession.getId());
+			}
 		}
 	}
 
-	protected void handleNewSession(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession session) throws Exception {
-
-		logger.debug("Opening " + getTransportType() + " connection");
-		session.setFrameFormat(getFrameFormat(request));
-		session.writeFrame(response, SockJsFrame.openFrame());
-		session.delegateConnectionEstablished();
-	}
-
 	protected abstract MediaType getContentType();
 
 	protected abstract FrameFormat getFrameFormat(ServerHttpRequest request);

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSockJsSession.java

@@ -25,8 +25,8 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.AbstractServerSockJsSession;
 import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.sockjs.server.SockJsFrame;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportHandler;
 import org.springframework.util.Assert;
 import org.springframework.websocket.CloseStatus;
 import org.springframework.websocket.HandlerProvider;
@@ -55,32 +55,64 @@ public abstract class AbstractHttpServerSockJsSession extends AbstractServerSock
 		super(sessionId, sockJsConfig, handler);
 	}
 
-	public void setFrameFormat(FrameFormat frameFormat) {
-		this.frameFormat = frameFormat;
+	public synchronized void setInitialRequest(ServerHttpRequest request, ServerHttpResponse response,
+			FrameFormat frameFormat) throws TransportErrorException {
+
+		try {
+			udpateRequest(request, response, frameFormat);
+			writePrelude();
+			writeFrame(SockJsFrame.openFrame());
+		}
+		catch (Throwable t) {
+			tryCloseWithSockJsTransportError(t, null);
+			throw new TransportErrorException("Failed open SockJS session", t, getId());
+		}
+		delegateConnectionEstablished();
+	}
+
+	protected void writePrelude() throws IOException {
 	}
 
-	public synchronized void setCurrentRequest(ServerHttpRequest request, ServerHttpResponse response,
-			FrameFormat frameFormat) throws Exception {
+	public synchronized void setLongPollingRequest(ServerHttpRequest request, ServerHttpResponse response,
+			FrameFormat frameFormat) throws TransportErrorException {
+
+		try {
+			udpateRequest(request, response, frameFormat);
+
+			if (isClosed()) {
+				logger.debug("connection already closed");
+				try {
+					writeFrame(SockJsFrame.closeFrameGoAway());
+				}
+				catch (IOException ex) {
+					throw new TransportErrorException("Failed to send SockJS close frame", ex, getId());
+				}
+				return;
+			}
+
+			this.asyncRequest.setTimeout(-1);
+			this.asyncRequest.startAsync();
 
-		if (isClosed()) {
-			logger.debug("connection already closed");
-			writeFrame(response, SockJsFrame.closeFrameGoAway());
-			return;
+			scheduleHeartbeat();
+			tryFlushCache();
+		}
+		catch (Throwable t) {
+			tryCloseWithSockJsTransportError(t, null);
+			throw new TransportErrorException("Failed to start long running request and flush messages", t, getId());
 		}
+	}
 
+	private void udpateRequest(ServerHttpRequest request, ServerHttpResponse response, FrameFormat frameFormat) {
+		Assert.notNull(request, "expected request");
+		Assert.notNull(response, "expected response");
+		Assert.notNull(frameFormat, "expected frameFormat");
 		Assert.isInstanceOf(AsyncServerHttpRequest.class, request, "Expected AsyncServerHttpRequest");
-
 		this.asyncRequest = (AsyncServerHttpRequest) request;
-		this.asyncRequest.setTimeout(-1);
-		this.asyncRequest.startAsync();
-
 		this.response = response;
 		this.frameFormat = frameFormat;
-
-		scheduleHeartbeat();
-		tryFlushCache();
 	}
 
+
 	public synchronized boolean isActive() {
 		return ((this.asyncRequest != null) && (!this.asyncRequest.isAsyncCompleted()));
 	}
@@ -89,18 +121,20 @@ public abstract class AbstractHttpServerSockJsSession extends AbstractServerSock
 		return this.messageCache;
 	}
 
+	protected ServerHttpRequest getRequest() {
+		return this.asyncRequest;
+	}
+
 	protected ServerHttpResponse getResponse() {
 		return this.response;
 	}
 
-	protected final synchronized void sendMessageInternal(String message) throws Exception {
-		// assert close() was not called
-		// threads: TH-Session-Endpoint or any other thread
+	protected final synchronized void sendMessageInternal(String message) throws IOException {
 		this.messageCache.add(message);
 		tryFlushCache();
 	}
 
-	private void tryFlushCache() throws Exception {
+	private void tryFlushCache() throws IOException {
 		if (isActive() && !getMessageCache().isEmpty()) {
 			logger.trace("Flushing messages");
 			flushCache();
@@ -110,7 +144,7 @@ public abstract class AbstractHttpServerSockJsSession extends AbstractServerSock
 	/**
 	 * Only called if the connection is currently active
 	 */
-	protected abstract void flushCache() throws Exception;
+	protected abstract void flushCache() throws IOException;
 
 	@Override
 	protected void disconnect(CloseStatus status) {
@@ -133,21 +167,12 @@ public abstract class AbstractHttpServerSockJsSession extends AbstractServerSock
 
 	protected synchronized void writeFrameInternal(SockJsFrame frame) throws IOException {
 		if (isActive()) {
-			writeFrame(this.response, frame);
-		}
-	}
-
-	/**
-	 * This method may be called by a {@link TransportHandler} to write a frame
-	 * even when the connection is not active, as long as a valid OutputStream
-	 * is provided.
-	 */
-	public void writeFrame(ServerHttpResponse response, SockJsFrame frame) throws IOException {
-		frame = this.frameFormat.format(frame);
-		if (logger.isTraceEnabled()) {
-			logger.trace("Writing " + frame);
+			frame = this.frameFormat.format(frame);
+			if (logger.isTraceEnabled()) {
+				logger.trace("Writing " + frame);
+			}
+			this.response.getBody().write(frame.getContentBytes());
 		}
-		response.getBody().write(frame.getContentBytes());
 	}
 
 }

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractStreamingTransportHandler.java

@@ -1,62 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.sockjs.server.transport;
-
-import java.io.IOException;
-
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.util.Assert;
-import org.springframework.websocket.HandlerProvider;
-import org.springframework.websocket.WebSocketHandler;
-
-
-/**
- * TODO
- *
- * @author Rossen Stoyanchev
- * @since 4.0
- */
-public abstract class AbstractStreamingTransportHandler extends AbstractHttpSendingTransportHandler {
-
-
-	@Override
-	public StreamingServerSockJsSession createSession(String sessionId, HandlerProvider<WebSocketHandler> handler) {
-		Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration");
-		return new StreamingServerSockJsSession(sessionId, getSockJsConfig(), handler);
-	}
-
-	@Override
-	public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession session) throws Exception {
-
-		writePrelude(request, response);
-		super.handleRequestInternal(request, response, session);
-	}
-
-	protected abstract void writePrelude(ServerHttpRequest request, ServerHttpResponse response)
-			throws IOException;
-
-	@Override
-	protected void handleNewSession(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession session) throws IOException, Exception {
-
-		super.handleNewSession(request, response, session);
-
-		session.setCurrentRequest(request, response, getFrameFormat(request));
-	}
-
-}

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/EventSourceTransportHandler.java

@@ -20,10 +20,12 @@ import java.nio.charset.Charset;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
 import org.springframework.sockjs.server.TransportType;
+import org.springframework.util.Assert;
+import org.springframework.websocket.HandlerProvider;
+import org.springframework.websocket.WebSocketHandler;
 
 
 /**
@@ -32,7 +34,7 @@ import org.springframework.sockjs.server.TransportType;
  * @author Rossen Stoyanchev
  * @since 4.0
  */
-public class EventSourceTransportHandler extends AbstractStreamingTransportHandler {
+public class EventSourceTransportHandler extends AbstractHttpSendingTransportHandler {
 
 
 	@Override
@@ -46,10 +48,16 @@ public class EventSourceTransportHandler extends AbstractStreamingTransportHandl
 	}
 
 	@Override
-	protected void writePrelude(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
-		response.getBody().write('\r');
-		response.getBody().write('\n');
-		response.flush();
+	public StreamingServerSockJsSession createSession(String sessionId, HandlerProvider<WebSocketHandler> handler) {
+		Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration");
+		return new StreamingServerSockJsSession(sessionId, getSockJsConfig(), handler) {
+			@Override
+			protected void writePrelude() throws IOException {
+				getResponse().getBody().write('\r');
+				getResponse().getBody().write('\n');
+				getResponse().flush();
+			}
+		};
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/HtmlFileTransportHandler.java

@@ -24,9 +24,13 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportType;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.JavaScriptUtils;
+import org.springframework.websocket.HandlerProvider;
+import org.springframework.websocket.WebSocketHandler;
 
 
 /**
@@ -35,7 +39,7 @@ import org.springframework.web.util.JavaScriptUtils;
  * @author Rossen Stoyanchev
  * @since 4.0
  */
-public class HtmlFileTransportHandler extends AbstractStreamingTransportHandler {
+public class HtmlFileTransportHandler extends AbstractHttpSendingTransportHandler {
 
 	private static final String PARTIAL_HTML_CONTENT;
 
@@ -77,27 +81,40 @@ public class HtmlFileTransportHandler extends AbstractStreamingTransportHandler
 	}
 
 	@Override
-	public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession session) throws Exception {
+	public StreamingServerSockJsSession createSession(String sessionId, HandlerProvider<WebSocketHandler> handler) {
+		Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration");
 
-		String callback = request.getQueryParams().getFirst("c");
-		if (! StringUtils.hasText(callback)) {
-			response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
-			response.getBody().write("\"callback\" parameter required".getBytes("UTF-8"));
-			return;
-		}
-		super.handleRequestInternal(request, response, session);
+		return new StreamingServerSockJsSession(sessionId, getSockJsConfig(), handler) {
+
+			@Override
+			protected void writePrelude() throws IOException {
+				// we already validated the parameter..
+				String callback = getRequest().getQueryParams().getFirst("c");
+
+				String html = String.format(PARTIAL_HTML_CONTENT, callback);
+				getResponse().getBody().write(html.getBytes("UTF-8"));
+				getResponse().flush();
+			}
+		};
 	}
 
 	@Override
-	protected void writePrelude(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
-
-		// we already validated the parameter..
-		String callback = request.getQueryParams().getFirst("c");
+	public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
+			AbstractHttpServerSockJsSession session) throws TransportErrorException {
+
+		try {
+			String callback = request.getQueryParams().getFirst("c");
+			if (! StringUtils.hasText(callback)) {
+				response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
+				response.getBody().write("\"callback\" parameter required".getBytes("UTF-8"));
+				return;
+			}
+		}
+		catch (Throwable t) {
+			throw new TransportErrorException("Failed to send error to client", t, session.getId());
+		}
 
-		String html = String.format(PARTIAL_HTML_CONTENT, callback);
-		response.getBody().write(html.getBytes("UTF-8"));
-		response.flush();
+		super.handleRequestInternal(request, response, session);
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpPollingTransportHandler.java

@@ -23,6 +23,7 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.SockJsFrame;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -58,14 +59,20 @@ public class JsonpPollingTransportHandler extends AbstractHttpSendingTransportHa
 
 	@Override
 	public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractHttpServerSockJsSession session) throws Exception {
+			AbstractHttpServerSockJsSession session) throws TransportErrorException {
 
-		String callback = request.getQueryParams().getFirst("c");
-		if (! StringUtils.hasText(callback)) {
-			response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
-			response.getBody().write("\"callback\" parameter required".getBytes("UTF-8"));
-			return;
+		try {
+			String callback = request.getQueryParams().getFirst("c");
+			if (! StringUtils.hasText(callback)) {
+				response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
+				response.getBody().write("\"callback\" parameter required".getBytes("UTF-8"));
+				return;
+			}
 		}
+		catch (Throwable t) {
+			throw new TransportErrorException("Failed to send error to client", t, session.getId());
+		}
+
 		super.handleRequestInternal(request, response, session);
 	}
 

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpTransportHandler.java

@@ -22,6 +22,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.AbstractSockJsSession;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportType;
 
 public class JsonpTransportHandler extends AbstractHttpReceivingTransportHandler {
@@ -34,19 +35,23 @@ public class JsonpTransportHandler extends AbstractHttpReceivingTransportHandler
 
 	@Override
 	public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,
-			AbstractSockJsSession sockJsSession) throws Exception {
+			AbstractSockJsSession sockJsSession) throws TransportErrorException {
 
 		if (MediaType.APPLICATION_FORM_URLENCODED.equals(request.getHeaders().getContentType())) {
 			if (request.getQueryParams().getFirst("d") == null) {
-				response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
-				response.getBody().write("Payload expected.".getBytes("UTF-8"));
+				sendInternalServerError(response, "Payload expected.", sockJsSession.getId());
 				return;
 			}
 		}
 
 		super.handleRequestInternal(request, response, sockJsSession);
 
-		response.getBody().write("ok".getBytes("UTF-8"));
+		try {
+			response.getBody().write("ok".getBytes("UTF-8"));
+		}
+		catch (Throwable t) {
+			throw new TransportErrorException("Failed to write response body", t, sockJsSession.getId());
+		}
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingServerSockJsSession.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.sockjs.server.transport;
 
+import java.io.IOException;
+
 import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.sockjs.server.SockJsFrame;
 import org.springframework.websocket.HandlerProvider;
@@ -30,7 +32,7 @@ public class PollingServerSockJsSession extends AbstractHttpServerSockJsSession
 	}
 
 	@Override
-	protected void flushCache() throws Exception {
+	protected void flushCache() throws IOException {
 		cancelHeartbeat();
 		String[] messages = getMessageCache().toArray(new String[getMessageCache().size()]);
 		getMessageCache().clear();
@@ -38,7 +40,7 @@ public class PollingServerSockJsSession extends AbstractHttpServerSockJsSession
 	}
 
 	@Override
-	protected void writeFrame(SockJsFrame frame) throws Exception {
+	protected void writeFrame(SockJsFrame frame) throws IOException {
 		super.writeFrame(frame);
 		resetRequest();
 	}

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java

@@ -19,9 +19,6 @@ package org.springframework.sockjs.server.transport;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.sockjs.AbstractSockJsSession;
 import org.springframework.sockjs.server.AbstractServerSockJsSession;
 import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.sockjs.server.SockJsFrame;
@@ -38,7 +35,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 /**
- * A wrapper around a {@link WebSocketHandler} instance that parses and adds SockJS
+ * A wrapper around a {@link WebSocketHandler} instance that parses as well as adds SockJS
  * messages frames as well as sends SockJS heartbeat messages.
  *
  * @author Rossen Stoyanchev
@@ -46,13 +43,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  */
 public class SockJsWebSocketHandler implements TextMessageHandler {
 
-	private static final Log logger = LogFactory.getLog(SockJsWebSocketHandler.class);
-
 	private final SockJsConfiguration sockJsConfig;
 
 	private final HandlerProvider<WebSocketHandler> handlerProvider;
 
-	private AbstractSockJsSession session;
+	private WebSocketServerSockJsSession sockJsSession;
 
 	private final AtomicInteger sessionCount = new AtomicInteger(0);
 
@@ -72,38 +67,25 @@ public class SockJsWebSocketHandler implements TextMessageHandler {
 	}
 
 	@Override
-	public void afterConnectionEstablished(WebSocketSession wsSession) throws Exception {
+	public void afterConnectionEstablished(WebSocketSession wsSession) {
 		Assert.isTrue(this.sessionCount.compareAndSet(0, 1), "Unexpected connection");
-		this.session = new WebSocketServerSockJsSession(wsSession, getSockJsConfig());
+		this.sockJsSession = new WebSocketServerSockJsSession(getSockJsSessionId(wsSession), getSockJsConfig());
+		this.sockJsSession.initWebSocketSession(wsSession);
 	}
 
 	@Override
-	public void handleTextMessage(TextMessage message, WebSocketSession wsSession) throws Exception {
-		String payload = message.getPayload();
-		if (StringUtils.isEmpty(payload)) {
-			logger.trace("Ignoring empty message");
-			return;
-		}
-		String[] messages;
-		try {
-			messages = this.objectMapper.readValue(payload, String[].class);
-		}
-		catch (IOException e) {
-			logger.error("Broken data received. Terminating WebSocket connection abruptly", e);
-			wsSession.close();
-			return;
-		}
-		this.session.delegateMessages(messages);
+	public void handleTextMessage(TextMessage message, WebSocketSession wsSession) {
+		this.sockJsSession.handleMessage(message, wsSession);
 	}
 
 	@Override
-	public void afterConnectionClosed(CloseStatus status, WebSocketSession wsSession) throws Exception {
-		this.session.delegateConnectionClosed(status);
+	public void afterConnectionClosed(CloseStatus status, WebSocketSession wsSession) {
+		this.sockJsSession.delegateConnectionClosed(status);
 	}
 
 	@Override
-	public void handleError(Throwable exception, WebSocketSession webSocketSession) throws Exception {
-		this.session.delegateError(exception);
+	public void handleTransportError(Throwable exception, WebSocketSession webSocketSession) {
+		this.sockJsSession.delegateError(exception);
 	}
 
 	private static String getSockJsSessionId(WebSocketSession wsSession) {
@@ -117,16 +99,23 @@ public class SockJsWebSocketHandler implements TextMessageHandler {
 
 	private class WebSocketServerSockJsSession extends AbstractServerSockJsSession {
 
-		private final WebSocketSession wsSession;
+		private WebSocketSession wsSession;
 
 
-		public WebSocketServerSockJsSession(WebSocketSession wsSession, SockJsConfiguration sockJsConfig)
-				throws Exception {
+		public WebSocketServerSockJsSession(String sessionId, SockJsConfiguration config) {
+			super(sessionId, config, SockJsWebSocketHandler.this.handlerProvider);
+		}
 
-			super(getSockJsSessionId(wsSession), sockJsConfig, SockJsWebSocketHandler.this.handlerProvider);
+		public void initWebSocketSession(WebSocketSession wsSession) {
 			this.wsSession = wsSession;
-			TextMessage message = new TextMessage(SockJsFrame.openFrame().getContent());
-			this.wsSession.sendMessage(message);
+			try {
+				TextMessage message = new TextMessage(SockJsFrame.openFrame().getContent());
+				this.wsSession.sendMessage(message);
+			}
+			catch (IOException ex) {
+				tryCloseWithSockJsTransportError(ex, null);
+				return;
+			}
 			scheduleHeartbeat();
 			delegateConnectionEstablished();
 		}
@@ -136,15 +125,33 @@ public class SockJsWebSocketHandler implements TextMessageHandler {
 			return this.wsSession.isOpen();
 		}
 
+		public void handleMessage(TextMessage message, WebSocketSession wsSession) {
+			String payload = message.getPayload();
+			if (StringUtils.isEmpty(payload)) {
+				logger.trace("Ignoring empty message");
+				return;
+			}
+			String[] messages;
+			try {
+				messages = objectMapper.readValue(payload, String[].class);
+			}
+			catch (IOException ex) {
+				logger.error("Broken data received. Terminating WebSocket connection abruptly", ex);
+				tryCloseWithSockJsTransportError(ex, CloseStatus.BAD_DATA);
+				return;
+			}
+			delegateMessages(messages);
+		}
+
 		@Override
-		public void sendMessageInternal(String message) throws Exception {
+		public void sendMessageInternal(String message) throws IOException {
 			cancelHeartbeat();
 			writeFrame(SockJsFrame.messageFrame(message));
 			scheduleHeartbeat();
 		}
 
 		@Override
-		protected void writeFrameInternal(SockJsFrame frame) throws Exception {
+		protected void writeFrameInternal(SockJsFrame frame) throws IOException {
 			if (logger.isTraceEnabled()) {
 				logger.trace("Write " + frame);
 			}
@@ -153,7 +160,7 @@ public class SockJsWebSocketHandler implements TextMessageHandler {
 		}
 
 		@Override
-		protected void disconnect(CloseStatus status) throws Exception {
+		protected void disconnect(CloseStatus status) throws IOException {
 			this.wsSession.close(status);
 		}
 	}

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingServerSockJsSession.java

@@ -17,9 +17,12 @@ package org.springframework.sockjs.server.transport;
 
 import java.io.IOException;
 
+import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.sockjs.server.SockJsFrame;
+import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.websocket.HandlerProvider;
 import org.springframework.websocket.WebSocketHandler;
 
@@ -35,7 +38,15 @@ public class StreamingServerSockJsSession extends AbstractHttpServerSockJsSessio
 		super(sessionId, sockJsConfig, handler);
 	}
 
-	protected void flushCache() throws Exception {
+	@Override
+	public synchronized void setInitialRequest(ServerHttpRequest request, ServerHttpResponse response,
+			FrameFormat frameFormat) throws TransportErrorException {
+
+		super.setInitialRequest(request, response, frameFormat);
+		super.setLongPollingRequest(request, response, frameFormat);
+	}
+
+	protected void flushCache() throws IOException {
 
 		cancelHeartbeat();
 
@@ -68,9 +79,12 @@ public class StreamingServerSockJsSession extends AbstractHttpServerSockJsSessio
 	}
 
 	@Override
-	public void writeFrame(ServerHttpResponse response, SockJsFrame frame) throws IOException {
-		super.writeFrame(response, frame);
-		response.flush();
+	protected synchronized void writeFrameInternal(SockJsFrame frame) throws IOException {
+		if (isActive()) {
+			super.writeFrameInternal(frame);
+			getResponse().flush();
+		}
 	}
+
 }
 

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketTransportHandler.java

@@ -16,11 +16,14 @@
 
 package org.springframework.sockjs.server.transport;
 
+import java.io.IOException;
+
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.AbstractSockJsSession;
 import org.springframework.sockjs.server.ConfigurableTransportHandler;
 import org.springframework.sockjs.server.SockJsConfiguration;
+import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.sockjs.server.TransportHandler;
 import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
@@ -62,17 +65,22 @@ public class WebSocketTransportHandler implements ConfigurableTransportHandler,
 
 	@Override
 	public void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler, AbstractSockJsSession session) throws Exception {
-
-		WebSocketHandler sockJsWrapper = new SockJsWebSocketHandler(this.sockJsConfig, handler);
-		this.handshakeHandler.doHandshake(request, response, new SimpleHandlerProvider<WebSocketHandler>(sockJsWrapper));
+			HandlerProvider<WebSocketHandler> handler, AbstractSockJsSession session) throws TransportErrorException {
+
+		try {
+			WebSocketHandler sockJsWrapper = new SockJsWebSocketHandler(this.sockJsConfig, handler);
+			this.handshakeHandler.doHandshake(request, response, new SimpleHandlerProvider<WebSocketHandler>(sockJsWrapper));
+		}
+		catch (Throwable t) {
+			throw new TransportErrorException("Failed to start handshake request", t, session.getId());
+		}
 	}
 
 	// HandshakeHandler methods
 
 	@Override
 	public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler) throws Exception {
+			HandlerProvider<WebSocketHandler> handler) throws IOException {
 
 		return this.handshakeHandler.doHandshake(request, response, handler);
 	}

spring-websocket/src/main/java/org/springframework/sockjs/server/transport/XhrStreamingTransportHandler.java

@@ -20,10 +20,12 @@ import java.nio.charset.Charset;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
 import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
 import org.springframework.sockjs.server.TransportType;
+import org.springframework.util.Assert;
+import org.springframework.websocket.HandlerProvider;
+import org.springframework.websocket.WebSocketHandler;
 
 
 /**
@@ -32,7 +34,7 @@ import org.springframework.sockjs.server.TransportType;
  * @author Rossen Stoyanchev
  * @since 4.0
  */
-public class XhrStreamingTransportHandler extends AbstractStreamingTransportHandler {
+public class XhrStreamingTransportHandler extends AbstractHttpSendingTransportHandler {
 
 
 	@Override
@@ -46,12 +48,20 @@ public class XhrStreamingTransportHandler extends AbstractStreamingTransportHand
 	}
 
 	@Override
-	protected void writePrelude(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
-		for (int i=0; i < 2048; i++) {
-			response.getBody().write('h');
-		}
-		response.getBody().write('\n');
-		response.flush();
+	public StreamingServerSockJsSession createSession(String sessionId, HandlerProvider<WebSocketHandler> handler) {
+		Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration");
+
+		return new StreamingServerSockJsSession(sessionId, getSockJsConfig(), handler) {
+
+			@Override
+			protected void writePrelude() throws IOException {
+				for (int i=0; i < 2048; i++) {
+					getResponse().getBody().write('h');
+				}
+				getResponse().getBody().write('\n');
+				getResponse().flush();
+			}
+		};
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/websocket/BinaryMessageHandler.java

@@ -29,7 +29,6 @@ public interface BinaryMessageHandler extends WebSocketHandler {
 	/**
 	 * Handle an incoming binary message.
 	 */
-	void handleBinaryMessage(BinaryMessage message, WebSocketSession session)
-			throws Exception;
+	void handleBinaryMessage(BinaryMessage message, WebSocketSession session);
 
 }

spring-websocket/src/main/java/org/springframework/websocket/TextMessageHandler.java

@@ -34,7 +34,6 @@ public interface TextMessageHandler extends WebSocketHandler {
 	/**
 	 * Handle an incoming text message.
 	 */
-	void handleTextMessage(TextMessage message, WebSocketSession session)
-			throws Exception;
+	void handleTextMessage(TextMessage message, WebSocketSession session);
 
 }

spring-websocket/src/main/java/org/springframework/websocket/WebSocketHandler.java

@@ -29,16 +29,16 @@ public interface WebSocketHandler {
 	/**
 	 * A new WebSocket connection has been opened and is ready to be used.
 	 */
-	void afterConnectionEstablished(WebSocketSession session) throws Exception;
+	void afterConnectionEstablished(WebSocketSession session);
 
 	/**
 	 * A WebSocket connection has been closed.
 	 */
-	void afterConnectionClosed(CloseStatus closeStatus, WebSocketSession session) throws Exception;
+	void afterConnectionClosed(CloseStatus closeStatus, WebSocketSession session);
 
 	/**
 	 * TODO
 	 */
-	void handleError(Throwable exception, WebSocketSession session) throws Exception;
+	void handleTransportError(Throwable exception, WebSocketSession session);
 
 }

spring-websocket/src/main/java/org/springframework/websocket/WebSocketHandlerAdapter.java

@@ -26,15 +26,15 @@ package org.springframework.websocket;
 public class WebSocketHandlerAdapter implements WebSocketHandler {
 
 	@Override
-	public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+	public void afterConnectionEstablished(WebSocketSession session) {
 	}
 
 	@Override
-	public void afterConnectionClosed(CloseStatus status, WebSocketSession session) throws Exception {
+	public void afterConnectionClosed(CloseStatus status, WebSocketSession session) {
 	}
 
 	@Override
-	public void handleError(Throwable exception, WebSocketSession session) {
+	public void handleTransportError(Throwable exception, WebSocketSession session) {
 	}
 
 

spring-websocket/src/main/java/org/springframework/websocket/WebSocketSession.java

@@ -16,10 +16,10 @@
 
 package org.springframework.websocket;
 
+import java.io.IOException;
 import java.net.URI;
 
 
-
 /**
  * Allows sending messages over a WebSocket connection as well as closing it.
  *
@@ -52,7 +52,7 @@ public interface WebSocketSession {
 	 * Send a WebSocket message either {@link TextMessage} or
 	 * {@link BinaryMessage}.
 	 */
-	void sendMessage(WebSocketMessage message) throws Exception;
+	void sendMessage(WebSocketMessage<?> message) throws IOException;
 
 	/**
 	 * Close the WebSocket connection with status 1000, i.e. equivalent to:
@@ -60,11 +60,11 @@ public interface WebSocketSession {
 	 * session.close(CloseStatus.NORMAL);
 	 * </pre>
 	 */
-	void close() throws Exception;
+	void close() throws IOException;
 
 	/**
 	 * Close the WebSocket connection with the given close status.
 	 */
-	void close(CloseStatus status) throws Exception;
+	void close(CloseStatus status) throws IOException;
 
 }

spring-websocket/src/main/java/org/springframework/websocket/endpoint/WebSocketHandlerEndpoint.java

@@ -110,7 +110,34 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 			this.handler.afterConnectionEstablished(this.webSocketSession);
 		}
 		catch (Throwable ex) {
-			onError(session, ex);
+			tryCloseWithError(ex);
+		}
+	}
+
+	private void tryCloseWithError(Throwable ex) {
+		logger.error("Unhandled error for " + this.webSocketSession, ex);
+		if (this.webSocketSession.isOpen()) {
+			try {
+				this.webSocketSession.close(CloseStatus.SERVER_ERROR);
+			}
+			catch (Throwable t) {
+				destroyHandler();
+			}
+		}
+	}
+
+	private void destroyHandler() {
+		try {
+			if (this.handler != null) {
+				this.handlerProvider.destroy(this.handler);
+			}
+		}
+		catch (Throwable t) {
+			logger.warn("Error while destroying handler", t);
+		}
+		finally {
+			this.webSocketSession = null;
+			this.handler = null;
 		}
 	}
 
@@ -123,7 +150,7 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 			((TextMessageHandler) handler).handleTextMessage(textMessage, this.webSocketSession);
 		}
 		catch (Throwable ex) {
-			onError(session, ex);
+			tryCloseWithError(ex);
 		}
 	}
 
@@ -136,7 +163,7 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 			((BinaryMessageHandler) handler).handleBinaryMessage(binaryMessage, this.webSocketSession);
 		}
 		catch (Throwable ex) {
-			onError(session, ex);
+			tryCloseWithError(ex);
 		}
 	}
 
@@ -150,7 +177,7 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 			this.handler.afterConnectionClosed(closeStatus, this.webSocketSession);
 		}
 		catch (Throwable ex) {
-			onError(session, ex);
+			logger.error("Unhandled error for " + this.webSocketSession, ex);
 		}
 		finally {
 			this.handlerProvider.destroy(this.handler);
@@ -161,11 +188,10 @@ public class WebSocketHandlerEndpoint extends Endpoint {
 	public void onError(javax.websocket.Session session, Throwable exception) {
 		logger.error("Error for WebSocket session id=" + session.getId(), exception);
 		try {
-			this.handler.handleError(exception, this.webSocketSession);
+			this.handler.handleTransportError(exception, this.webSocketSession);
 		}
 		catch (Throwable ex) {
-			// TODO: close the session?
-			logger.error("Failed to handle error", ex);
+			tryCloseWithError(ex);
 		}
 	}
 

spring-websocket/src/main/java/org/springframework/websocket/server/DefaultHandshakeHandler.java

@@ -88,7 +88,7 @@ public class DefaultHandshakeHandler implements HandshakeHandler {
 
 	@Override
 	public final boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler) throws Exception {
+			HandlerProvider<WebSocketHandler> handler) throws IOException {
 
 		logger.debug("Starting handshake for " + request.getURI());
 
@@ -199,10 +199,15 @@ public class DefaultHandshakeHandler implements HandshakeHandler {
 		return null;
 	}
 
-    private String getWebSocketKeyHash(String key) throws NoSuchAlgorithmException {
-        MessageDigest digest = MessageDigest.getInstance("SHA1");
-        byte[] bytes = digest.digest((key + GUID).getBytes(Charset.forName("ISO-8859-1")));
-		return DatatypeConverter.printBase64Binary(bytes);
+    private String getWebSocketKeyHash(String key) {
+    	try {
+	        MessageDigest digest = MessageDigest.getInstance("SHA1");
+	        byte[] bytes = digest.digest((key + GUID).getBytes(Charset.forName("ISO-8859-1")));
+			return DatatypeConverter.printBase64Binary(bytes);
+    	}
+    	catch (NoSuchAlgorithmException ex) {
+    		throw new IllegalStateException("Failed to generate value for Sec-WebSocket-Key header", ex);
+    	}
     }
 
 

spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeHandler.java

@@ -16,6 +16,8 @@
 
 package org.springframework.websocket.server;
 
+import java.io.IOException;
+
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.websocket.HandlerProvider;
@@ -32,6 +34,6 @@ public interface HandshakeHandler {
 
 
 	boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response,
-			HandlerProvider<WebSocketHandler> handler) throws Exception;
+			HandlerProvider<WebSocketHandler> handler) throws IOException;
 
 }

spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java

@@ -16,6 +16,8 @@
 
 package org.springframework.websocket.server;
 
+import java.io.IOException;
+
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.websocket.HandlerProvider;
@@ -43,7 +45,7 @@ public interface RequestUpgradeStrategy {
 	 * @param handler the handler for WebSocket messages
 	 */
 	void upgrade(ServerHttpRequest request, ServerHttpResponse response, String selectedProtocol,
-			HandlerProvider<WebSocketHandler> handlerProvider) throws Exception;
+			HandlerProvider<WebSocketHandler> handlerProvider) throws IOException;
 	// FIXME how to indicate failure to upgrade?
 
 }

spring-websocket/src/main/java/org/springframework/websocket/server/support/AbstractEndpointUpgradeStrategy.java

@@ -16,6 +16,8 @@
 
 package org.springframework.websocket.server.support;
 
+import java.io.IOException;
+
 import javax.websocket.Endpoint;
 
 import org.apache.commons.logging.Log;
@@ -42,7 +44,7 @@ public abstract class AbstractEndpointUpgradeStrategy implements RequestUpgradeS
 
 	@Override
 	public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
-			String protocol, HandlerProvider<WebSocketHandler> handler) throws Exception {
+			String protocol, HandlerProvider<WebSocketHandler> handler) throws IOException {
 
 		upgradeInternal(request, response, protocol, adaptWebSocketHandler(handler));
 	}
@@ -52,6 +54,6 @@ public abstract class AbstractEndpointUpgradeStrategy implements RequestUpgradeS
 	}
 
 	protected abstract void upgradeInternal(ServerHttpRequest request, ServerHttpResponse response,
-			String selectedProtocol, Endpoint endpoint) throws Exception;
+			String selectedProtocol, Endpoint endpoint) throws IOException;
 
 }

spring-websocket/src/main/java/org/springframework/websocket/server/support/GlassfishRequestUpgradeStrategy.java

@@ -16,6 +16,7 @@
 
 package org.springframework.websocket.server.support;
 
+import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.net.URI;
 import java.util.Arrays;
@@ -24,6 +25,7 @@ import java.util.Random;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
+import javax.websocket.DeploymentException;
 import javax.websocket.Endpoint;
 
 import org.glassfish.tyrus.core.ComponentProviderService;
@@ -67,7 +69,7 @@ public class GlassfishRequestUpgradeStrategy extends AbstractEndpointUpgradeStra
 
 	@Override
 	public void upgradeInternal(ServerHttpRequest request, ServerHttpResponse response,
-			String selectedProtocol, Endpoint endpoint) throws Exception {
+			String selectedProtocol, Endpoint endpoint) throws IOException {
 
 		Assert.isTrue(request instanceof ServletServerHttpRequest);
 		HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
@@ -78,7 +80,13 @@ public class GlassfishRequestUpgradeStrategy extends AbstractEndpointUpgradeStra
 
 		TyrusEndpoint tyrusEndpoint = createTyrusEndpoint(servletRequest, endpoint, selectedProtocol);
 		WebSocketEngine engine = WebSocketEngine.getEngine();
-		engine.register(tyrusEndpoint);
+
+		try {
+			engine.register(tyrusEndpoint);
+		}
+		catch (DeploymentException ex) {
+			throw new IllegalStateException("Failed to deploy endpoint in Glassfish", ex);
+		}
 
 		try {
 			if (!performUpgrade(servletRequest, servletResponse, request.getHeaders(), tyrusEndpoint)) {
@@ -91,7 +99,7 @@ public class GlassfishRequestUpgradeStrategy extends AbstractEndpointUpgradeStra
 	}
 
 	private boolean performUpgrade(HttpServletRequest request, HttpServletResponse response,
-			HttpHeaders headers, TyrusEndpoint tyrusEndpoint) throws Exception {
+			HttpHeaders headers, TyrusEndpoint tyrusEndpoint) throws IOException {
 
 		final TyrusHttpUpgradeHandler upgradeHandler = request.upgrade(TyrusHttpUpgradeHandler.class);
 
@@ -128,12 +136,17 @@ public class GlassfishRequestUpgradeStrategy extends AbstractEndpointUpgradeStra
 				endpointConfig.getConfigurator()));
 	}
 
-	private Connection createConnection(TyrusHttpUpgradeHandler handler, HttpServletResponse response) throws Exception {
-		String name = "org.glassfish.tyrus.servlet.ConnectionImpl";
-		Class<?> clazz = ClassUtils.forName(name, GlassfishRequestUpgradeStrategy.class.getClassLoader());
-		Constructor<?> constructor = clazz.getDeclaredConstructor(TyrusHttpUpgradeHandler.class, HttpServletResponse.class);
-		ReflectionUtils.makeAccessible(constructor);
-		return (Connection) constructor.newInstance(handler, response);
+	private Connection createConnection(TyrusHttpUpgradeHandler handler, HttpServletResponse response) {
+		try {
+			String name = "org.glassfish.tyrus.servlet.ConnectionImpl";
+			Class<?> clazz = ClassUtils.forName(name, GlassfishRequestUpgradeStrategy.class.getClassLoader());
+			Constructor<?> constructor = clazz.getDeclaredConstructor(TyrusHttpUpgradeHandler.class, HttpServletResponse.class);
+			ReflectionUtils.makeAccessible(constructor);
+			return (Connection) constructor.newInstance(handler, response);
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException("Failed to instantiate Glassfish connection", ex);
+		}
 	}
 
 

spring-websocket/src/main/java/org/springframework/websocket/server/support/JettyRequestUpgradeStrategy.java

@@ -18,6 +18,7 @@ package org.springframework.websocket.server.support;
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -101,7 +102,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 	@Override
 	public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
 			String selectedProtocol, HandlerProvider<WebSocketHandler> handlerProvider)
-			throws Exception {
+			throws IOException {
 		Assert.isInstanceOf(ServletServerHttpRequest.class, request);
 		Assert.isInstanceOf(ServletServerHttpResponse.class, response);
 		upgrade(((ServletServerHttpRequest) request).getServletRequest(),
@@ -111,7 +112,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
 	private void upgrade(HttpServletRequest request, HttpServletResponse response,
 			String selectedProtocol, final HandlerProvider<WebSocketHandler> handlerProvider)
-			throws Exception {
+			throws IOException {
 		request.setAttribute(HANDLER_PROVIDER, handlerProvider);
 		Assert.state(factory.isUpgradeRequest(request, response), "Not a suitable WebSocket upgrade request");
 		Assert.state(factory.acceptWebSocket(request, response), "Unable to accept WebSocket");
@@ -129,6 +130,8 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
 		private WebSocketSession session;
 
+		private final AtomicInteger sessionCount = new AtomicInteger(0);
+
 
 		public WebSocketHandlerAdapter(HandlerProvider<WebSocketHandler> provider) {
 			Assert.notNull(provider, "Provider must not be null");
@@ -139,31 +142,53 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
 		@Override
 		public void onWebSocketConnect(Session session) {
-			Assert.state(this.session == null, "WebSocket already open");
+
+			Assert.isTrue(this.sessionCount.compareAndSet(0, 1), "Unexpected connection");
+
+			this.session = new WebSocketSessionAdapter(session);
+			if (logger.isDebugEnabled()) {
+				logger.debug("Connection established, WebSocket session id="
+						+ this.session.getId() + ", uri=" + this.session.getURI());
+			}
+			this.handler = this.provider.getHandler();
+
 			try {
-				this.session = new WebSocketSessionAdapter(session);
-				if (logger.isDebugEnabled()) {
-					logger.debug("Connection established, WebSocket session id="
-							+ this.session.getId() + ", uri=" + this.session.getURI());
-				}
-				this.handler = this.provider.getHandler();
 				this.handler.afterConnectionEstablished(this.session);
 			}
-			catch (Exception ex) {
+			catch (Throwable ex) {
+				tryCloseWithError(ex);
+			}
+		}
+
+		private void tryCloseWithError(Throwable ex) {
+			logger.error("Unhandled error for " + this.session, ex);
+			if (this.session.isOpen()) {
 				try {
-					// FIXME revisit after error handling
-					onWebSocketError(ex);
+					this.session.close(CloseStatus.SERVER_ERROR);
 				}
-				finally {
-					this.session = null;
-					this.handler = null;
+				catch (Throwable t) {
+					destroyHandler();
 				}
 			}
 		}
 
+		private void destroyHandler() {
+			try {
+				if (this.handler != null) {
+					this.provider.destroy(this.handler);
+				}
+			}
+			catch (Throwable t) {
+				logger.warn("Error while destroying handler", t);
+			}
+			finally {
+				this.session = null;
+				this.handler = null;
+			}
+		}
+
 		@Override
 		public void onWebSocketClose(int statusCode, String reason) {
-			Assert.state(this.session != null, "WebSocket not open");
 			try {
 				CloseStatus closeStatus = new CloseStatus(statusCode, reason);
 				if (logger.isDebugEnabled()) {
@@ -172,19 +197,11 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 				}
 				this.handler.afterConnectionClosed(closeStatus, this.session);
 			}
-			catch (Exception ex) {
-				onWebSocketError(ex);
+			catch (Throwable ex) {
+				logger.error("Unhandled error for " + this.session, ex);
 			}
 			finally {
-				try {
-					if (this.handler != null) {
-						this.provider.destroy(this.handler);
-					}
-				}
-				finally {
-					this.session = null;
-					this.handler = null;
-				}
+				destroyHandler();
 			}
 		}
 
@@ -200,8 +217,8 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 					((TextMessageHandler) this.handler).handleTextMessage(message, this.session);
 				}
 			}
-			catch(Exception ex) {
-				ex.printStackTrace(); //FIXME
+			catch(Throwable ex) {
+				tryCloseWithError(ex);
 			}
 		}
 
@@ -218,20 +235,18 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 							this.session);
 				}
 			}
-			catch(Exception ex) {
-				ex.printStackTrace(); //FIXME
+			catch(Throwable ex) {
+				tryCloseWithError(ex);
 			}
 		}
 
 		@Override
 		public void onWebSocketError(Throwable cause) {
 			try {
-				this.handler.handleError(cause, this.session);
+				this.handler.handleTransportError(cause, this.session);
 			}
 			catch (Throwable ex) {
-				// FIXME exceptions
-				logger.error("Error for WebSocket session id=" + this.session.getId(),
-						cause);
+				tryCloseWithError(ex);
 			}
 		}
 	}
@@ -271,7 +286,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 		}
 
 		@Override
-		public void sendMessage(WebSocketMessage message) throws Exception {
+		public void sendMessage(WebSocketMessage message) throws IOException {
 			if (message instanceof BinaryMessage) {
 				sendMessage((BinaryMessage) message);
 			}
@@ -283,11 +298,11 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 			}
 		}
 
-		private void sendMessage(BinaryMessage message) throws Exception {
+		private void sendMessage(BinaryMessage message) throws IOException {
 			this.session.getRemote().sendBytes(message.getPayload());
 		}
 
-		private void sendMessage(TextMessage message) throws Exception {
+		private void sendMessage(TextMessage message) throws IOException {
 			this.session.getRemote().sendString(message.getPayload());
 		}