From 3e09a4ee604029ee796f6102cf65004b052d0f9c Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 28 Nov 2008 06:57:29 +0000 Subject: [PATCH] allowed low water mark to be same with high water mark --- .../channel/socket/nio/DefaultNioSocketChannelConfig.java | 2 +- .../org/jboss/netty/channel/socket/nio/NioSocketChannel.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java index 36224a7f11..364e62b762 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java @@ -45,7 +45,7 @@ class DefaultNioSocketChannelConfig extends DefaultSocketChannelConfig InternalLoggerFactory.getInstance(DefaultNioSocketChannelConfig.class); private volatile int writeBufferHighWaterMark = 256 * 1024; - private volatile int writeBufferLowWaterMark = 64 * 1024; + private volatile int writeBufferLowWaterMark = 128 * 1024; private volatile ReceiveBufferSizePredictor predictor = new DefaultReceiveBufferSizePredictor(); private volatile int writeSpinCount = 16; diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java index dfeaba0984..e638931e23 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java @@ -171,7 +171,8 @@ abstract class NioSocketChannel extends AbstractChannel if (e != null) { int newWriteBufferSize = writeBufferSize.addAndGet( -((ChannelBuffer) e.getMessage()).readableBytes()); - if (newWriteBufferSize <= getConfig().getWriteBufferLowWaterMark()) { + if (newWriteBufferSize == 0 || + newWriteBufferSize < getConfig().getWriteBufferLowWaterMark()) { exceededHighWaterMark = true; } }