Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-09-20 16:22:38 +0000
committerEike Stepper2012-09-20 16:22:38 +0000
commitad96ed4c75620ce6cbd9b3eab0b7a60de65ae9e4 (patch)
tree0b69b0f1c6c5e20acb371862d5835e1fe4d2d116
parent7eb61c799410636d2ad57343610488df4507c02b (diff)
downloadcdo-ad96ed4c75620ce6cbd9b3eab0b7a60de65ae9e4.tar.gz
cdo-ad96ed4c75620ce6cbd9b3eab0b7a60de65ae9e4.tar.xz
cdo-ad96ed4c75620ce6cbd9b3eab0b7a60de65ae9e4.zip
[389525] Concurrent Access to Models Rollback / Conflict Resolution
Exceptions https://bugs.eclipse.org/bugs/show_bug.cgi?id=389525
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java8
1 files changed, 4 insertions, 4 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 c0d55561e5..d019aee105 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
@@ -302,16 +302,16 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
InternalChannel channel = writeQueue.peek();
if (channel != null)
{
- Queue<IBuffer> bufferQueue = channel.getSendQueue();
- if (bufferQueue != null)
+ Queue<IBuffer> channelSendQueue = channel.getSendQueue();
+ if (channelSendQueue != null)
{
- IBuffer buffer = bufferQueue.peek();
+ IBuffer buffer = channelSendQueue.peek();
if (buffer != null)
{
if (buffer.write(socketChannel))
{
writeQueue.poll();
- bufferQueue.poll();
+ channelSendQueue.poll();
buffer.release();
}
}

Back to the top