SockJsTransportFailureException provides constructor variant without session id

(cherry picked from commit e0a11f2)

Author: jhoeller

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -30,15 +30,30 @@ public class SockJsException extends NestedRuntimeException {
 	private final String sessionId;
 
 
+	/**
+	 * Constructor for SockJsException.
+	 * @param message the exception message
+	 * @param cause the root cause
+	 */
 	public SockJsException(String message, Throwable cause) {
 		this(message, null, cause);
 	}
 
+	/**
+	 * Constructor for SockJsException.
+	 * @param message the exception message
+	 * @param sessionId the SockJS session id
+	 * @param cause the root cause
+	 */
 	public SockJsException(String message, String sessionId, Throwable cause) {
 		super(message, cause);
 		this.sessionId = sessionId;
 	}
 
+
+	/**
+	 * Return the SockJS session id.
+	 */
 	public String getSockJsSessionId() {
 		return this.sessionId;
 	}

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsTransportFailureException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -17,16 +17,32 @@
 package org.springframework.web.socket.sockjs;
 
 /**
- * Indicates a serious failure that occurred in the SockJS implementation as opposed to in
- * user code (e.g. IOException while writing to the response). When this exception is
- * raised, the SockJS session is typically closed.
+ * Indicates a serious failure that occurred in the SockJS implementation as opposed to
+ * in user code (e.g. IOException while writing to the response). When this exception
+ * is raised, the SockJS session is typically closed.
  *
  * @author Rossen Stoyanchev
  * @since 4.0
  */
 @SuppressWarnings("serial")
 public class SockJsTransportFailureException extends SockJsException {
 
+	/**
+	 * Constructor for SockJsTransportFailureException.
+	 * @param message the exception message
+	 * @param cause the root cause
+	 * @since 4.1.7
+	 */
+	public SockJsTransportFailureException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	/**
+	 * Constructor for SockJsTransportFailureException.
+	 * @param message the exception message
+	 * @param sessionId the SockJS session id
+	 * @param cause the root cause
+	 */
 	public SockJsTransportFailureException(String message, String sessionId, Throwable cause) {
 		super(message, sessionId, cause);
 	}

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -205,7 +205,7 @@ private void handleFailure(Throwable ex, boolean isTimeoutFailure) {
 				if (isTimeoutFailure) {
 					String message = "Connect timed out for " + DefaultTransportRequest.this;
 					logger.error(message);
-					ex = new SockJsTransportFailureException(message, getSockJsUrlInfo().getSessionId(), null);
+					ex = new SockJsTransportFailureException(message, getSockJsUrlInfo().getSessionId(), ex);
 				}
 				if (fallbackRequest != null) {
 					logger.error(DefaultTransportRequest.this + " failed. Falling back on next transport.", ex);

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -126,7 +126,7 @@ protected ResponseEntity<String> executeRequest(URI url, HttpMethod method, Http
 			response = httpRequest.send();
 		}
 		catch (Exception ex) {
-			throw new SockJsTransportFailureException("Failed to execute request to " + url, null, ex);
+			throw new SockJsTransportFailureException("Failed to execute request to " + url, ex);
 		}
 		HttpStatus status = HttpStatus.valueOf(response.getStatus());
 		HttpHeaders responseHeaders = toHttpHeaders(response.getHeaders());