Update version of Netty dependency

facebookarchive · Dec 29, 2015 · 01108da · 01108da
1 parent 0561b5f
commit 01108da
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/nifty-client/src/main/java/com/facebook/nifty/client/HttpClientChannel.java b/nifty-client/src/main/java/com/facebook/nifty/client/HttpClientChannel.java
@@ -85,15 +85,15 @@ protected ChannelFuture writeRequest(ChannelBuffer request)
         HttpRequest httpRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST,
                                                          endpointUri);
 
-        httpRequest.setHeader(HttpHeaders.HOST, hostName);
-        httpRequest.setHeader(HttpHeaders.CONTENT_LENGTH, request.readableBytes());
-        httpRequest.setHeader(HttpHeaders.CONTENT_TYPE, "application/x-thrift");
-        httpRequest.setHeader(HttpHeaders.ACCEPT, "application/x-thrift");
-        httpRequest.setHeader(HttpHeaders.USER_AGENT, "Java/Swift-HttpThriftClientChannel");
+        httpRequest.headers().add(HttpHeaders.HOST, hostName);
+        httpRequest.headers().add(HttpHeaders.CONTENT_LENGTH, request.readableBytes());
+        httpRequest.headers().add(HttpHeaders.CONTENT_TYPE, "application/x-thrift");
+        httpRequest.headers().add(HttpHeaders.ACCEPT, "application/x-thrift");
+        httpRequest.headers().add(HttpHeaders.USER_AGENT, "Java/Swift-HttpThriftClientChannel");
 
         if (headerDictionary != null) {
             for (Map.Entry<String, String> entry : headerDictionary.entrySet()) {
-                httpRequest.setHeader(entry.getKey(), entry.getValue());
+                httpRequest.headers().add(entry.getKey(), entry.getValue());
             }
         }
 

diff --git a/nifty-examples/src/test/java/com/facebook/nifty/server/DeafSelectorProvider.java b/nifty-examples/src/test/java/com/facebook/nifty/server/DeafSelectorProvider.java
@@ -68,6 +68,7 @@ public AbstractSelector openSelector() throws IOException
     {
         return new AbstractSelector(this) {
 
+            private final Object lock = new Object();
             private final Set<SelectionKey> keys = Sets.newHashSet();
 
             @Override
@@ -153,19 +154,36 @@ public int selectNow() throws IOException
             @Override
             public int select(long timeout) throws IOException
             {
-                return 0;
+                synchronized (lock) {
+                    try {
+                        lock.wait(timeout);
+                        return 0;
+                    } catch (InterruptedException e) {
+                        throw new IOException(e);
+                    }
+                }
             }
 
             @Override
             public int select() throws IOException
             {
-                return 0;
+                synchronized (lock) {
+                    try {
+                        lock.wait();
+                        return 0;
+                    } catch (InterruptedException e) {
+                        throw new IOException(e);
+                    }
+                }
             }
 
             @Override
             public Selector wakeup()
             {
-                return this;
+                synchronized (lock) {
+                    lock.notify();
+                    return this;
+                }
             }
 
         };

diff --git a/nifty-examples/src/test/java/com/facebook/nifty/server/TestNiftyClientTimeout.java b/nifty-examples/src/test/java/com/facebook/nifty/server/TestNiftyClientTimeout.java
@@ -17,6 +17,7 @@
 
 import com.facebook.nifty.client.FramedClientChannel;
 import com.facebook.nifty.client.FramedClientConnector;
+import com.facebook.nifty.client.NettyClientConfigBuilder;
 import com.facebook.nifty.client.NiftyClient;
 import com.facebook.nifty.test.scribe;
 import com.google.common.base.Throwables;
@@ -65,7 +66,8 @@ public void testSyncConnectTimeout() throws ConnectException, IOException
     {
         ServerSocket serverSocket = new ServerSocket(0);
         int port = serverSocket.getLocalPort();
-        final NiftyClient client = new NiftyClient();
+        NettyClientConfigBuilder builder = new NettyClientConfigBuilder().setBossThreadCount(1).setWorkerThreadCount(1);
+        final NiftyClient client = new NiftyClient(builder.build());
         try {
                 client.connectSync(scribe.Client.class,
                                    new FramedClientConnector(new InetSocketAddress(port)),

diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
-                <version>3.7.0.Final</version>
+                <version>3.10.5.Final</version>
             </dependency>
 
             <dependency>