From 19ba10454617adaa97715ee3d9697745e33d2684 Mon Sep 17 00:00:00 2001 From: Ganesh Date: Mon, 5 Jan 2015 00:37:19 +0530 Subject: [PATCH 1/2] Refactored initChannel to allow subclasses to have control over adding the channel handlers --- .../socketio/SocketIOChannelInitializer.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java b/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java index 9465593..89afdd9 100644 --- a/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java +++ b/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java @@ -135,14 +135,30 @@ public class SocketIOChannelInitializer extends ChannelInitializer impl @Override protected void initChannel(Channel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); - - if (sslContext != null) { + addSSlHandler(pipeline); + addSocketioHandlers(pipeline); + } + + /** + * Adds the ssl handler + * + * @return + */ + protected void addSSlHandler(ChannelPipeline pipeline) { + if (sslContext != null) { SSLEngine engine = sslContext.createSSLEngine(); engine.setUseClientMode(false); pipeline.addLast(SSL_HANDLER, new SslHandler(engine)); } - - pipeline.addLast(HTTP_REQUEST_DECODER, new HttpRequestDecoder()); + } + + /** + * Adds the socketio channel handlers + * + * @param pipeline + */ + protected void addSocketioHandlers(ChannelPipeline pipeline) { + pipeline.addLast(HTTP_REQUEST_DECODER, new HttpRequestDecoder()); pipeline.addLast(HTTP_AGGREGATOR, new HttpObjectAggregator(configuration.getMaxHttpContentLength())); pipeline.addLast(HTTP_ENCODER, new HttpResponseEncoder()); From 3a97c3ae3227f1dd6cbe2d7d8d7ca48bc698b4eb Mon Sep 17 00:00:00 2001 From: Ganesh Date: Mon, 5 Jan 2015 16:31:30 +0530 Subject: [PATCH 2/2] Spell check --- .../corundumstudio/socketio/SocketIOChannelInitializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java b/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java index 89afdd9..f777468 100644 --- a/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java +++ b/src/main/java/com/corundumstudio/socketio/SocketIOChannelInitializer.java @@ -135,7 +135,7 @@ public class SocketIOChannelInitializer extends ChannelInitializer impl @Override protected void initChannel(Channel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); - addSSlHandler(pipeline); + addSslHandler(pipeline); addSocketioHandlers(pipeline); } @@ -144,7 +144,7 @@ public class SocketIOChannelInitializer extends ChannelInitializer impl * * @return */ - protected void addSSlHandler(ChannelPipeline pipeline) { + protected void addSslHandler(ChannelPipeline pipeline) { if (sslContext != null) { SSLEngine engine = sslContext.createSSLEngine(); engine.setUseClientMode(false);