Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit 67ba187)
This commit is contained in:
Juergen Hoeller
2016-08-10 14:20:42 +02:00
parent 349f2ad578
commit 7b33cd6476
26 changed files with 224 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
View File

@@ -117,8 +117,8 @@ public class JettyWebSocketClient extends AbstractWebSocketClient implements Lif
}
this.client.start();
}
catch (Exception e) {
throw new IllegalStateException("Failed to start Jetty client", e);
catch (Exception ex) {
throw new IllegalStateException("Failed to start Jetty client", ex);
}
}
}
@@ -134,8 +134,8 @@ public class JettyWebSocketClient extends AbstractWebSocketClient implements Lif
}
this.client.stop();
}
catch (Exception e) {
logger.error("Error stopping Jetty WebSocketClient", e);
catch (Exception ex) {
logger.error("Error stopping Jetty WebSocketClient", ex);
}
}
}

12
spring-websocket/src/main/java/org/springframework/web/socket/handler/BinaryWebSocketHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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.
@@ -24,9 +24,11 @@ import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
/**
* A convenient base class for {@link WebSocketHandler} implementation that process binary
* messages only. Text messages are rejected with {@link CloseStatus#NOT_ACCEPTABLE}. All
* other methods have empty implementations.
* A convenient base class for {@link WebSocketHandler} implementations
* that process binary messages only.
*
* <p>Text messages are rejected with {@link CloseStatus#NOT_ACCEPTABLE}.
* All other methods have empty implementations.
*
* @author Rossen Stoyanchev
* @author Phillip Webb
@@ -39,7 +41,7 @@ public class BinaryWebSocketHandler extends AbstractWebSocketHandler {
try {
session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Text messages not supported"));
}
catch (IOException e) {
catch (IOException ex) {
// ignore
}
}

10
spring-websocket/src/main/java/org/springframework/web/socket/handler/TextWebSocketHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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.
@@ -24,9 +24,11 @@ import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
/**
* A convenient base class for {@link WebSocketHandler} implementation that process text
* messages only. Binary messages are rejected with {@link CloseStatus#NOT_ACCEPTABLE}. All
* other methods have empty implementations.
* A convenient base class for {@link WebSocketHandler} implementations
* that process text messages only.
*
* <p>Binary messages are rejected with {@link CloseStatus#NOT_ACCEPTABLE}.
* All other methods have empty implementations.
*
* @author Rossen Stoyanchev
* @author Phillip Webb

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

@@ -82,8 +82,8 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
this.httpClient.start();
}
}
catch (Exception e) {
throw new SockJsException("Failed to start " + this, e);
catch (Exception ex) {
throw new SockJsException("Failed to start " + this, ex);
}
}
@@ -94,8 +94,8 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
this.httpClient.stop();
}
}
catch (Exception e) {
throw new SockJsException("Failed to stop " + this, e);
catch (Exception ex) {
throw new SockJsException("Failed to stop " + this, ex);
}
}
@@ -154,6 +154,7 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
new ResponseEntity<String>(responseHeaders, status));
}
private static void addHttpHeaders(Request request, HttpHeaders headers) {
for (String name : headers.keySet()) {
for (String value : headers.get(name)) {
@@ -194,7 +195,6 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
public SockJsResponseListener(URI url, HttpHeaders headers, XhrClientSockJsSession sockJsSession,
SettableListenableFuture<WebSocketSession> connectFuture) {
@@ -204,7 +204,6 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
this.sockJsSession = sockJsSession;
}
@Override
public void onBegin(Response response) {
if (response.getStatus() != 200) {