diff options
author | Eike Stepper | 2009-05-05 11:11:28 +0000 |
---|---|---|
committer | Eike Stepper | 2009-05-05 11:11:28 +0000 |
commit | 7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a (patch) | |
tree | aee16ed86104a07418d119986af70d9f3d0d7976 /plugins/org.eclipse.net4j | |
parent | edb6eda1c3041c7dd945b3a550d34108a26f2f62 (diff) | |
download | cdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.tar.gz cdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.tar.xz cdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.zip |
formatting
Diffstat (limited to 'plugins/org.eclipse.net4j')
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java index b976a39c35..cd84df3c3b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.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 */ @@ -67,6 +67,7 @@ class RemoteExceptionRequest extends Request { nl = message.length(); } + if (nl > 100) { nl = 100; 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 144b44506a..8879ecde16 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 @@ -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 */ @@ -145,7 +145,6 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements try { - try { long timeout = getOpenChannelTimeout() - System.currentTimeMillis() + start; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java index 02ae26d792..6c623f0efb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.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 */ @@ -131,6 +131,7 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo finishedNegotiating.countDown(); finishedNegotiating = null; } + break; case CONNECTING: |