You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2011/10/03 21:46:06 UTC
svn commit: r1178536 - in /avro/trunk: CHANGES.txt
lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java
Author: cutting
Date: Mon Oct 3 19:46:05 2011
New Revision: 1178536
URL: http://svn.apache.org/viewvc?rev=1178536&view=rev
Log:
AVRO-898. Java: Extend NettyServer to support SSL. Contributed by Vadim Tsarik.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java
Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1178536&r1=1178535&r2=1178536&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Mon Oct 3 19:46:05 2011
@@ -87,6 +87,9 @@ Avro 1.6.0 (unreleased)
AVRO-899. C#: Include binary artifacts and documentation in
releases. (cutting)
+ AVRO-898. Java: Extend NettyServer to support SSL.
+ (Vadim Tsarik via cutting)
+
BUG FIXES
AVRO-824. Java: Fix usage message of BinaryFragmentToJsonTool.
Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java?rev=1178536&r1=1178535&r2=1178536&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/NettyServer.java Mon Oct 3 19:46:05 2011
@@ -63,9 +63,14 @@ public class NettyServer implements Serv
private final CountDownLatch closed = new CountDownLatch(1);
public NettyServer(Responder responder, InetSocketAddress addr) {
+ this(responder, addr, new NioServerSocketChannelFactory
+ (Executors .newCachedThreadPool(), Executors.newCachedThreadPool()));
+ }
+
+ public NettyServer(Responder responder, InetSocketAddress addr,
+ ChannelFactory channelFactory) {
this.responder = responder;
- channelFactory = new NioServerSocketChannelFactory(Executors
- .newCachedThreadPool(), Executors.newCachedThreadPool());
+ this.channelFactory = channelFactory;
ServerBootstrap bootstrap = new ServerBootstrap(channelFactory);
bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
@Override