summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-10-08 07:39:55 (EDT)
committerEike Stepper2007-10-08 07:39:55 (EDT)
commit02d49b0152d3c7a7ce6a8ad2281dc532b0d359c3 (patch)
treedcdf0b182ab096fecb5e3d5e91f1b48a815cc04e
parent2c5b5c8cc319259953c0e75d606a01c1dfb6abb9 (diff)
downloadcdo-02d49b0152d3c7a7ce6a8ad2281dc532b0d359c3.zip
cdo-02d49b0152d3c7a7ce6a8ad2281dc532b0d359c3.tar.gz
cdo-02d49b0152d3c7a7ce6a8ad2281dc532b0d359c3.tar.bz2
[205668] Provide buddies example
https://bugs.eclipse.org/bugs/show_bug.cgi?id=205668
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java1
4 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
index 50f163d..3cc6ec2 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
@@ -44,7 +44,7 @@ public abstract class OM
public static final OMLogger LOG = BUNDLE.logger();
- void stop() throws Exception
+ static void stop() throws Exception
{
BuddyAdmin.INSTANCE.deactivate();
}
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 adbd0d5..6dbf986c 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
@@ -297,7 +297,6 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
do
{
- System.out.println(connectorState);
if (isDisconnected())
{
return false;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
index 243411e..7d7c3be 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
@@ -41,6 +41,7 @@ public abstract class Indication extends SignalReactor
}
InputStream wrappedInputStream = wrapInputStream(in);
+ getProtocol().getChannel().getConnector().waitForConnection(5000L);
indicating(ExtendedDataInputStream.wrap(wrappedInputStream));
finishInputStream(wrappedInputStream);
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
index 9dc8ace..405332b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
@@ -43,6 +43,7 @@ public abstract class IndicationWithResponse extends SignalReactor
}
InputStream wrappedInputStream = wrapInputStream(in);
+ getProtocol().getChannel().getConnector().waitForConnection(5000L);
indicating(ExtendedDataInputStream.wrap(wrappedInputStream));
finishInputStream(wrappedInputStream);
if (TRACER.isEnabled())