Skip to content

Commit 213a559

Browse files
committed
Fix Channels active token name
Token set means channel is active
1 parent 2bc5236 commit 213a559

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

client/src/main/java/org/asynchttpclient/netty/channel/Channels.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class Channels {
2626
private static final Logger LOGGER = LoggerFactory.getLogger(Channels.class);
2727

2828
private static final AttributeKey<Object> DEFAULT_ATTRIBUTE = AttributeKey.valueOf("default");
29-
private static final AttributeKey<Inactive> INACTIVE_TOKEN_ATTRIBUTE = AttributeKey.valueOf("inactiveToken");
29+
private static final AttributeKey<Active> ACTIVE_TOKEN_ATTRIBUTE = AttributeKey.valueOf("activeToken");
3030

31-
private enum Inactive { INSTANCE }
31+
private enum Active { INSTANCE }
3232

3333
public static Object getAttribute(Channel channel) {
3434
Attribute<Object> attr = channel.attr(DEFAULT_ATTRIBUTE);
@@ -47,12 +47,12 @@ public static boolean isChannelValid(Channel channel) {
4747
return channel != null && channel.isActive();
4848
}
4949

50-
public static void setInactiveToken(Channel channel) {
51-
channel.attr(INACTIVE_TOKEN_ATTRIBUTE).set(Inactive.INSTANCE);
50+
public static void setActiveToken(Channel channel) {
51+
channel.attr(ACTIVE_TOKEN_ATTRIBUTE).set(Active.INSTANCE);
5252
}
5353

54-
public static boolean getInactiveToken(Channel channel) {
55-
return channel != null && channel.attr(INACTIVE_TOKEN_ATTRIBUTE).getAndSet(null) != null;
54+
public static boolean isActiveTokenSet(Channel channel) {
55+
return channel != null && channel.attr(ACTIVE_TOKEN_ATTRIBUTE).getAndSet(null) != null;
5656
}
5757

5858
public static void silentlyCloseChannel(Channel channel) {

client/src/main/java/org/asynchttpclient/netty/channel/NettyConnectListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void operationComplete(Future<? super Void> future) throws Exception {
103103
}
104104
}
105105

106-
Channels.setInactiveToken(channel);
106+
Channels.setActiveToken(channel);
107107

108108
TimeoutsHolder timeoutsHolder = future.getTimeoutsHolder();
109109

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ public void abort(Channel channel, NettyResponseFuture<?> future, Throwable t) {
465465
}
466466

467467
public void handleUnexpectedClosedChannel(Channel channel, NettyResponseFuture<?> future) {
468-
if (Channels.getInactiveToken(channel)) {
468+
if (Channels.isActiveTokenSet(channel)) {
469469
if (future.isDone()) {
470470
channelManager.closeChannel(channel);
471471
} else if (future.incrementRetryAndCheck() && retry(future)) {

0 commit comments

Comments
 (0)