From a6eda905943566d863504b283d116c549a1dff11 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 16 Mar 2012 09:16:46 +1100 Subject: [PATCH] fixed merge issue --- .../main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java index fa8a02d505a..3a72cd2c1c9 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java @@ -397,12 +397,6 @@ public class ChannelEndPoint implements EndPoint } finally { - // adjust buffer 0 and 1 - if (!header.isImmutable()) - header.setGetIndex(bbuf0.position()); - if (!buffer.isImmutable()) - buffer.setGetIndex(bbuf1.position()); - bbuf0.position(0); bbuf1.position(0); bbuf0.limit(bbuf0.capacity());