Skip to content

Netty: Fix releasing limit for connections pool per host #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2015
Merged

Netty: Fix releasing limit for connections pool per host #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ public boolean remove(Object o) {
}

if (maxConnectionsPerHostEnabled) {
freeChannelsPerHost = new ConcurrentHashMap<String, Semaphore>();
channelId2KeyPool = new ConcurrentHashMap<Integer, String>();
freeChannelsPerHost = new ConcurrentHashMap<>();
channelId2KeyPool = new ConcurrentHashMap<>();
} else {
freeChannelsPerHost = null;
channelId2KeyPool = null;
Expand Down Expand Up @@ -381,8 +381,11 @@ public void abortChannelPreemption(String poolKey) {
getFreeConnectionsForHost(poolKey).release();
}

public void registerOpenChannel(Channel channel) {
public void registerOpenChannel(Channel channel, final String poolKey) {
openChannels.add(channel);
if (maxConnectionsPerHostEnabled) {
channelId2KeyPool.put(channel.getId(), poolKey);
}
}

private HttpClientCodec newHttpClientCodec() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ning/http/client/providers/netty/request/NettyConnectListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private void writeRequest(Channel channel, String poolKey) {
if (future.getAsyncHandler() instanceof AsyncHandlerExtensions)
AsyncHandlerExtensions.class.cast(future.getAsyncHandler()).onConnectionOpen();

channelManager.registerOpenChannel(channel);
channelManager.registerOpenChannel(channel, poolKey);
future.attachChannel(channel, false);
requestSender.writeRequest(future, channel);
}
Expand Down