Merge 96a56af into a4cac0c

CorfuDB · Dec 12, 2017 · 37dba6c · 37dba6c
2 parents a4cac0c + 96a56af
commit 37dba6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java b/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java
@@ -143,7 +143,7 @@ public void removeServer(AbstractServer server) {
      */
     public void sendResponse(ChannelHandlerContext ctx, CorfuMsg inMsg, CorfuMsg outMsg) {
         outMsg.copyBaseFields(inMsg);
-        ctx.writeAndFlush(outMsg);
+        ctx.writeAndFlush(outMsg, ctx.voidPromise());
         log.trace("Sent response: {}", outMsg);
     }
 

diff --git a/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java b/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java
@@ -522,9 +522,9 @@ public <T> CompletableFuture<T> sendMessageAndGetCompletable(ChannelHandlerConte
             outstandingRequests.put(thisRequest, cf);
             // Write the message out to the channel.
             if (ctx == null) {
-                channel.writeAndFlush(message);
+                channel.writeAndFlush(message, channel.voidPromise());
             } else {
-                ctx.writeAndFlush(message);
+                ctx.writeAndFlush(message, ctx.voidPromise());
             }
             log.trace("Sent message: {}", message);
             final CompletableFuture<T> cfElapsed = cf.thenApply(x -> {
@@ -568,7 +568,7 @@ public void sendMessage(ChannelHandlerContext ctx, CorfuMsg message) {
         message.setRequestID(thisRequest);
         message.setEpoch(epoch);
         // Write this message out on the channel.
-        outContext.writeAndFlush(message);
+        outContext.writeAndFlush(message, outContext.voidPromise());
 //        MetricsUtils.incConditionalCounter(MetricsUtils
 //                .isMetricsCollectionEnabled(), counterAsyncOpSent, 1);
         log.trace("Sent one-way message: {}", message);
@@ -585,7 +585,7 @@ public void sendMessage(ChannelHandlerContext ctx, CorfuMsg message) {
     public void sendResponseToServer(ChannelHandlerContext ctx, CorfuMsg inMsg, CorfuMsg outMsg) {
         outMsg.copyBaseFields(inMsg);
         outMsg.setEpoch(epoch);
-        ctx.writeAndFlush(outMsg);
+        ctx.writeAndFlush(outMsg, ctx.voidPromise());
         log.trace("Sent response: {}", outMsg);
     }