You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/23 20:02:56 UTC
svn commit: r1654320 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SendfileDataBase.java
Author: markt
Date: Fri Jan 23 19:02:55 2015
New Revision: 1654320
URL: http://svn.apache.org/r1654320
Log:
Pull up length
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1654320&r1=1654319&r2=1654320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 23 19:02:55 2015
@@ -1921,8 +1921,6 @@ public class AprEndpoint extends Abstrac
// File
public long fd;
public long fdpool;
- // Range information
- public long length;
// Socket and socket pool
public long socket;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1654320&r1=1654319&r2=1654320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan 23 19:02:55 2015
@@ -1617,7 +1617,6 @@ public class Nio2Endpoint extends Abstra
*/
public static class SendfileData extends SendfileDataBase {
public FileChannel fchannel;
- public long length;
// Internal use only
private Nio2SocketWrapper socket;
private ByteBuffer buffer;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1654320&r1=1654319&r2=1654320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jan 23 19:02:55 2015
@@ -1757,6 +1757,5 @@ public class NioEndpoint extends Abstrac
*/
public static class SendfileData extends SendfileDataBase {
public volatile FileChannel fchannel;
- public volatile long length;
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java?rev=1654320&r1=1654319&r2=1654320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java Fri Jan 23 19:02:55 2015
@@ -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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org