Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java')
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
index dab31f371f..5a85aeeee5 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
@@ -178,16 +178,13 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
{
InternalChannel internalChannel = channel;
deregisterChannelFromPeer(internalChannel, getChannelTimeout());
- removeChannel(internalChannel, false);
+ removeChannel(internalChannel);
}
public void inverseCloseChannel(short channelID) throws ChannelException
{
InternalChannel channel = getChannel(channelID);
- if (channel != null && channel.isActive())
- {
- removeChannel(channel, true);
- }
+ LifecycleUtil.deactivate(channel);
}
protected InternalChannel createChannel()
@@ -334,7 +331,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
fireElementAddedEvent(channel);
}
- private void removeChannel(InternalChannel channel, boolean inverse)
+ private void removeChannel(InternalChannel channel)
{
try
{
@@ -351,7 +348,6 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
if (removed)
{
- channel.finishDeactivate(inverse);
fireElementRemovedEvent(channel);
}
}

Back to the top