andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small fix to the http tunnel to prevent null pointer is attempt is made to close channel twice

Browse Source
This commit is contained in:
Jamie Furness 2011-07-01 16:55:41 +01:00 committed by Trustin Lee
parent ccc155e96f
commit 8982838ab2
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
View File

@ -163,6 +163,15 @@ class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface,
@Override
public void clientCloseTunnel(String tunnelId) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
if (tunnel == null) {
if (LOG.isWarnEnabled()) {
LOG.warn("attempt made to close tunnel id " +
tunnelId + " which is unknown or closed");
}
return;
}
tunnel.localChannel.clientClosed();
tunnelsById.remove(tunnelId);
}
@ -170,6 +179,15 @@ class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface,
@Override
public void serverCloseTunnel(String tunnelId) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
if (tunnel == null) {
if (LOG.isWarnEnabled()) {
LOG.warn("attempt made to close tunnel id " +
tunnelId + " which is unknown or closed");
}
return;
}
tunnel.closing.set(true);
Channel responseChannel = tunnel.responseChannel.getAndSet(null);