From 9cc883a323daac237cd4134fc7e53dfb186ea6a5 Mon Sep 17 00:00:00 2001 From: lutovich Date: Thu, 29 Mar 2018 15:53:48 +0200 Subject: [PATCH] Upgrade Netty from 4.1.16.Final to 4.1.22.Final --- .../internal/async/ChannelConnectedListener.java | 10 +--------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java b/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java index ce7d97706b..734f96e8ff 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java +++ b/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java @@ -63,15 +63,7 @@ public void operationComplete( ChannelFuture future ) ChannelPipeline pipeline = channel.pipeline(); pipeline.addLast( new HandshakeHandler( pipelineBuilder, handshakeCompletedPromise, logging ) ); log.debug( "C: [Bolt Handshake] %s", handshakeString() ); - ChannelFuture handshakeFuture = channel.writeAndFlush( handshakeBuf() ); - - handshakeFuture.addListener( channelFuture -> - { - if ( !channelFuture.isSuccess() ) - { - handshakeCompletedPromise.setFailure( channelFuture.cause() ); - } - } ); + channel.writeAndFlush( handshakeBuf(), channel.voidPromise() ); } else { diff --git a/pom.xml b/pom.xml index ddcd87b37f..893e138168 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ io.netty netty-handler - 4.1.16.Final + 4.1.22.Final org.hdrhistogram