From 86f1bedaab683d77b86daa92d7ddde5aee4cedd7 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 10 Jun 2016 15:25:53 -0400 Subject: [PATCH] Rename NettyTransportChannel#close This commit renames the NettyTransportChannel#close method to NettyTransportChannel#release to clarify the semantics. --- .../transport/netty/NettyTransportChannel.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java index 91b6bc120ad..03856017c36 100644 --- a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java +++ b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java @@ -42,9 +42,6 @@ import org.jboss.netty.channel.ChannelFutureListener; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -/** - * - */ public class NettyTransportChannel implements TransportChannel { private final NettyTransport transport; @@ -55,7 +52,7 @@ public class NettyTransportChannel implements TransportChannel { private final long requestId; private final String profileName; private final long reservedBytes; - private final AtomicBoolean closed = new AtomicBoolean(); + private final AtomicBoolean released = new AtomicBoolean(); public NettyTransportChannel(NettyTransport transport, TransportServiceAdapter transportServiceAdapter, String action, Channel channel, long requestId, Version version, String profileName, long reservedBytes) { @@ -86,7 +83,7 @@ public class NettyTransportChannel implements TransportChannel { @Override public void sendResponse(TransportResponse response, TransportResponseOptions options) throws IOException { - close(); + release(); if (transport.compress) { options = TransportResponseOptions.builder(options).withCompress(transport.compress).build(); } @@ -128,7 +125,7 @@ public class NettyTransportChannel implements TransportChannel { @Override public void sendResponse(Throwable error) throws IOException { - close(); + release(); BytesStreamOutput stream = new BytesStreamOutput(); stream.skip(NettyHeader.HEADER_SIZE); RemoteTransportException tx = new RemoteTransportException( @@ -147,10 +144,10 @@ public class NettyTransportChannel implements TransportChannel { future.addListener(onResponseSentListener); } - private void close() { - // attempt to close once atomically - if (closed.compareAndSet(false, true) == false) { - throw new IllegalStateException("Channel is already closed"); + private void release() { + // attempt to release once atomically + if (released.compareAndSet(false, true) == false) { + throw new IllegalStateException("reserved bytes are already released"); } transport.inFlightRequestsBreaker().addWithoutBreaking(-reservedBytes); } @@ -174,4 +171,5 @@ public class NettyTransportChannel implements TransportChannel { public Channel getChannel() { return channel; } + }