summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-04 05:02:12 (EDT)
committerEike Stepper2007-08-04 05:02:12 (EDT)
commita3a93370427e1de918ddc119d06ad853524eba19 (patch)
treed3d159b2a6d09ae57688c0c2fd96b6c0dc5004b3
parent06a02453973969420d70cf304f0144a659e530dd (diff)
downloadcdo-a3a93370427e1de918ddc119d06ad853524eba19.zip
cdo-a3a93370427e1de918ddc119d06ad853524eba19.tar.gz
cdo-a3a93370427e1de918ddc119d06ad853524eba19.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java5
2 files changed, 5 insertions, 12 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index de7c1fb..069c1b9 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -278,21 +278,19 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
}
@Override
- protected boolean removeChannel(Channel channel, boolean actively)
+ protected boolean removeChannel(Channel channel)
{
- if (super.removeChannel(channel, actively))
+ if (super.removeChannel(channel))
{
- if (controlChannel != null && channel != null && isConnected() && actively)
+ if (controlChannel != null && isConnected())
{
controlChannel.deregisterChannel(channel.getChannelIndex());
}
return true;
}
- else
- {
- return false;
- }
+
+ return false;
}
@Override
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
index 8b3067c..1621de1 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
@@ -87,11 +87,6 @@ public abstract class Connector extends Lifecycle implements IConnector
@Override
protected IContainerEvent createContainerEvent(IContainer container, Object element, Kind kind)
{
- // if (kind == IContainerDelta.Kind.REMOVED)
- // {
- // removeChannel((Channel)element);
- // }
-
return new ConnectorChannelsEvent((IConnector)container, (IChannel)element, kind);
}
};