Author: markt
Date: Fri Jan 23 19:02:45 2015
New Revision: 1654318
URL: http://svn.apache.org/r1654318
Log:
Pull up pos and filename
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=1654318&r1=1654317&r2=1654318&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:45 2015
@@ -1919,15 +1919,12 @@ public class AprEndpoint extends Abstrac
*/
public static class SendfileData extends SendfileDataBase {
// File
- public String fileName;
public long fd;
public long fdpool;
// Range information
public long end;
// Socket and socket pool
public long socket;
- // Position
- public long pos;
}
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=1654318&r1=1654317&r2=1654318&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:45 2015
@@ -1616,10 +1616,7 @@ public class Nio2Endpoint extends Abstra
* SendfileData class.
*/
public static class SendfileData extends SendfileDataBase {
- // File
- public String fileName;
public FileChannel fchannel;
- public long pos;
public long length;
// Internal use only
private Nio2SocketWrapper socket;
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=1654318&r1=1654317&r2=1654318&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:45 2015
@@ -1756,10 +1756,7 @@ public class NioEndpoint extends Abstrac
* SendfileData class.
*/
public static class SendfileData extends SendfileDataBase {
- // File
- public volatile String fileName;
public volatile FileChannel fchannel;
- public volatile long pos;
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=1654318&r1=1654317&r2=1654318&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:45 2015
@@ -25,4 +25,17 @@ public abstract class SendfileDataBase {
* for that next request to arrive).
*/
public boolean keepAlive;
+
+ /**
+ * The full path to the file that contains the data to be written to the
+ * socket.
+ */
+ public String fileName;
+
+ /**
+ * The position of the next byte in the file to be written to the socket.
+ * This is initialised to the start point and then updated as the file is
+ * written.
+ */
+ public long pos;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
