summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-30 02:33:36 (EDT)
committerEike Stepper2007-08-30 02:33:36 (EDT)
commitd696795f6cee0998f327657d0ae70b700485822d (patch)
treea9627cbc2c1ced4f99989a33d96073a30fa431c2
parent3d6ad0ea65c76cfdca47400751bb1add1ffe8e61 (diff)
downloadcdo-d696795f6cee0998f327657d0ae70b700485822d.zip
cdo-d696795f6cee0998f327657d0ae70b700485822d.tar.gz
cdo-d696795f6cee0998f327657d0ae70b700485822d.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
index 94c57b0..7dbcd92 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
@@ -215,6 +215,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider
super.doActivate();
sendQueue = new ConcurrentLinkedQueue();
if (receiveExecutor == null)
+ // XXX if (true)
{
receiveSerializer = new SynchronousWorkSerializer();
}
@@ -307,7 +308,14 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider
public void run()
{
- receiveHandler.handleBuffer(buffer);
+ if (receiveHandler != null)
+ {
+ receiveHandler.handleBuffer(buffer);
+ }
+ else
+ {
+ buffer.release();
+ }
}
}
}