Pull up length

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1654320 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 23, 2015 · db01a16 · db01a16
1 parent a5d96d7
commit db01a16
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1921,8 +1921,6 @@ public static class SendfileData extends SendfileDataBase {
         // File
         public long fd;
         public long fdpool;
-        // Range information
-        public long length;
         // Socket and socket pool
         public long socket;
     }

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1617,7 +1617,6 @@ private void doRun() {
      */
     public static class SendfileData extends SendfileDataBase {
         public FileChannel fchannel;
-        public long length;
         // Internal use only
         private Nio2SocketWrapper socket;
         private ByteBuffer buffer;

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1757,6 +1757,5 @@ private void doRun(SelectionKey key, NioSocketWrapper ka) {
      */
     public static class SendfileData extends SendfileDataBase {
         public volatile FileChannel fchannel;
-        public volatile long length;
     }
 }
diff --git a/java/org/apache/tomcat/util/net/SendfileDataBase.java b/java/org/apache/tomcat/util/net/SendfileDataBase.java
@@ -38,4 +38,11 @@ public abstract class SendfileDataBase {
      * written.
      */
     public long pos;
+
+    /**
+     * The number of bytes remaining to be written from the file (from the
+     * current {@link #pos}. This is initialised to the end point - the start
+     * point and then updated as the file is written.
+     */
+    public long length;
 }