Removed unnecessary field.

jetty · Aug 20, 2015 · 9b6ba24 · 9b6ba24
1 parent 837a36e
commit 9b6ba24
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
@@ -23,7 +23,6 @@
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
-import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.SocketChannel;
 
 import org.eclipse.jetty.util.BufferUtil;
@@ -39,9 +38,8 @@ public class ChannelEndPoint extends AbstractEndPoint
 {
     private static final Logger LOG = Log.getLogger(ChannelEndPoint.class);
 
-    private final ByteChannel _channel;
+    private final SocketChannel _channel;
     private final Socket _socket;
-    private final GatheringByteChannel _gathering;
     private volatile boolean _ishut;
     private volatile boolean _oshut;
 
@@ -50,17 +48,16 @@ public ChannelEndPoint(Scheduler scheduler,SocketChannel channel)
         super(scheduler,
             (InetSocketAddress)channel.socket().getLocalSocketAddress(),
             (InetSocketAddress)channel.socket().getRemoteSocketAddress());
-        _channel = channel;
+        _channel=channel;
         _socket=channel.socket();
-        _gathering=_channel instanceof GatheringByteChannel?((GatheringByteChannel)_channel):null;
     }
 
     @Override
     public boolean isOptimizedForDirectBuffers()
     {
         return true;
     }
-    
+
     @Override
     public boolean isOpen()
     {
@@ -171,13 +168,13 @@ else if (filled==-1)
     @Override
     public boolean flush(ByteBuffer... buffers) throws IOException
     {
-        int flushed=0;
+        long flushed=0;
         try
         {
             if (buffers.length==1)
                 flushed=_channel.write(buffers[0]);
-            else if (_gathering!=null && buffers.length>1)
-                flushed= (int)_gathering.write(buffers,0,buffers.length);
+            else if (buffers.length>1)
+                flushed=_channel.write(buffers,0,buffers.length);
             else
             {
                 for (ByteBuffer b : buffers)