Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-01-07 07:30:01 +0000
committerEike Stepper2011-01-07 07:30:01 +0000
commitcd784f4a3a65c9c0ab867fe4af3e118daae5bcc4 (patch)
tree09fb8a117cdcd55e9262e08f43c494418bca0966
parent06e59e0b000a5a594bc0b0eae1887806e27a211c (diff)
downloadcdo-cd784f4a3a65c9c0ab867fe4af3e118daae5bcc4.tar.gz
cdo-cd784f4a3a65c9c0ab867fe4af3e118daae5bcc4.tar.xz
cdo-cd784f4a3a65c9c0ab867fe4af3e118daae5bcc4.zip
fixed DEFAULT_MILLIS_INTERRUPT_CHECK
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java1
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_241463_Test.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
index 7712a62971..27b65cf43d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
@@ -199,6 +199,7 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
{
protocol.setStreamWrapper(streamWrapper);
}
+
protocol.open(connector);
return protocol;
}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_241463_Test.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_241463_Test.java
index b8743ff88a..f0ebdd9df6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_241463_Test.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_241463_Test.java
@@ -20,7 +20,6 @@ import org.eclipse.net4j.internal.tcp.TCPServerConnector;
import org.eclipse.net4j.tcp.ITCPAcceptor;
import org.eclipse.net4j.tests.AbstractTransportTest;
import org.eclipse.net4j.tests.signal.TestSignalProtocol;
-import org.eclipse.net4j.util.ImplementationError;
import org.eclipse.net4j.util.concurrent.ExecutorServiceFactory;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.ManagedContainer;
@@ -90,7 +89,7 @@ public class Bugzilla_241463_Test extends AbstractTransportTest
@Override
public InternalChannel inverseOpenChannel(short channelIndex, String protocolID)
{
- throw new ImplementationError("Simulated problem"); //$NON-NLS-1$
+ throw new RuntimeException("Simulated problem"); //$NON-NLS-1$
}
};
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java
index fab62ca069..1a0dc1490e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -31,9 +31,9 @@ public class ChannelInputStream extends BufferInputStream
public ChannelInputStream(IChannel channel, long millisBeforeTimeout)
{
this.channel = channel;
- channel.setReceiveHandler(this);
this.millisBeforeTimeout = millisBeforeTimeout;
- millisInterruptCheck = DEFAULT_MILLIS_INTERRUPT_CHECK;
+
+ channel.setReceiveHandler(this);
}
public IChannel getChannel()

Back to the top