From 7ddf1b1ae132fe2581ca948d2f122ee5e8096c66 Mon Sep 17 00:00:00 2001 From: "Craig P. Motlin" Date: Mon, 14 Nov 2011 19:12:19 -0500 Subject: [PATCH 1/2] Remove unnecessary 'return' statement. --- .../http/websocketx/sslserver/WebSocketSslServerSslContext.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java index 6b668e60dc..64ab6e34da 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java @@ -92,8 +92,6 @@ public class WebSocketSslServerSslContext { throw new Error("Failed to initialize the server-side SSLContext", e); } _serverContext = serverContext; - - return; } catch (Exception ex) { logger.error("Error initializing SslContextManager. " + ex.getMessage(), ex); System.exit(1); From 461837e14b59092c6cb1b746275fa5c4ace8dafa Mon Sep 17 00:00:00 2001 From: "Craig P. Motlin" Date: Mon, 14 Nov 2011 19:14:06 -0500 Subject: [PATCH 2/2] Remove unnecessary concatenation with empty strings. --- .../netty/example/http/websocket/WebSocketServerIndexPage.java | 2 +- .../http/websocketx/server/WebSocketServerIndexPage.java | 2 +- .../http/websocketx/sslserver/WebSocketSslServerIndexPage.java | 2 +- .../jboss/netty/example/localtime/LocalTimeServerHandler.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java index 474a70d192..8ea63a4987 100644 --- a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java +++ b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java @@ -46,7 +46,7 @@ public class WebSocketServerIndexPage { "} else {" + NEWLINE + " alert(\"Your browser does not support Web Socket.\");" + NEWLINE + "}" + NEWLINE + - "" + NEWLINE + + NEWLINE + "function send(message) {" + NEWLINE + " if (!window.WebSocket) { return; }" + NEWLINE + " if (socket.readyState == WebSocket.OPEN) {" + NEWLINE + diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java index 179df6b633..1bd7fb63bd 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java @@ -50,7 +50,7 @@ public class WebSocketServerIndexPage { "} else {" + NEWLINE + " alert(\"Your browser does not support Web Socket.\");" + NEWLINE + "}" + NEWLINE + - "" + NEWLINE + + NEWLINE + "function send(message) {" + NEWLINE + " if (!window.WebSocket) { return; }" + NEWLINE + " if (socket.readyState == WebSocket.OPEN) {" + NEWLINE + diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java index 8fe45996f9..e3c84695ad 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java @@ -50,7 +50,7 @@ public class WebSocketSslServerIndexPage { "} else {" + NEWLINE + " alert(\"Your browser does not support Web Socket.\");" + NEWLINE + "}" + NEWLINE + - "" + NEWLINE + + NEWLINE + "function send(message) {" + NEWLINE + " if (!window.WebSocket) { return; }" + NEWLINE + " if (socket.readyState == WebSocket.OPEN) {" + NEWLINE + diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java index 261d709784..c2b1c297da 100644 --- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java +++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java @@ -93,6 +93,6 @@ public class LocalTimeServerHandler extends SimpleChannelUpstreamHandler { } private static String toString(Continent c) { - return "" + c.name().charAt(0) + c.name().toLowerCase().substring(1); + return c.name().charAt(0) + c.name().toLowerCase().substring(1); } }