From a67194fc2cf04333ca6281ee14820cf80318d4ca Mon Sep 17 00:00:00 2001 From: norman Date: Fri, 27 Apr 2012 08:57:52 +0200 Subject: [PATCH] Disable gathering writes till we want to release 3.5.0.Final --- .../java/org/jboss/netty/buffer/CompositeChannelBuffer.java | 5 ++++- .../netty/channel/socket/nio/SocketSendBufferPool.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java index 66d1cd0da9..ee1ecc91dc 100644 --- a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java +++ b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java @@ -277,9 +277,12 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer { public int getBytes(int index, GatheringByteChannel out, int length) throws IOException { + // Disable till 3.5.0.Final + /* if (DetectionUtil.javaVersion() >= 7) { return (int) out.write(toByteBuffers(index, length)); - } + }*/ + // XXX Gathering write is not supported because of a known issue. // See http://bugs.sun.com/view_bug.do?bug_id=6210541 // This issue appeared in 2004 and is still unresolved!? diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java index 6fec6306bc..ce5ce3eb0a 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java @@ -24,10 +24,8 @@ import java.nio.channels.GatheringByteChannel; import java.nio.channels.WritableByteChannel; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.CompositeChannelBuffer; import org.jboss.netty.channel.DefaultFileRegion; import org.jboss.netty.channel.FileRegion; -import org.jboss.netty.util.internal.DetectionUtil; final class SocketSendBufferPool { @@ -68,9 +66,11 @@ final class SocketSendBufferPool { return EMPTY_BUFFER; } + // Disable till 3.5.0.Final + /* if (src instanceof CompositeChannelBuffer && DetectionUtil.javaVersion() >= 7) { return new GatheringSendBuffer(src.toByteBuffers()); - } + }*/ if (src.isDirect()) { return new UnpooledSendBuffer(src.toByteBuffer()); }