Author: markt
Date: Sun Jun 5 10:14:15 2011
New Revision: 1132364
URL: http://svn.apache.org/viewvc?rev=1132364&view=rev
Log:
Reformat - no functional change. Just to aid comparison
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1132364&r1=1132363&r2=1132364&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Jun
5 10:14:15 2011
@@ -820,18 +820,18 @@ public class Http11AprProcessor extends
@Override
protected boolean prepareSendfile(OutputFilter[] outputFilters) {
- String fileName = (String)
request.getAttribute("org.apache.tomcat.sendfile.filename");
+ String fileName = (String) request.getAttribute(
+ "org.apache.tomcat.sendfile.filename");
if (fileName != null) {
// No entity body sent here
- outputBuffer.addActiveFilter
- (outputFilters[Constants.VOID_FILTER]);
+ outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
contentDelimitation = true;
sendfileData = new AprEndpoint.SendfileData();
sendfileData.fileName = fileName;
- sendfileData.start =
- ((Long)
request.getAttribute("org.apache.tomcat.sendfile.start")).longValue();
- sendfileData.end =
- ((Long)
request.getAttribute("org.apache.tomcat.sendfile.end")).longValue();
+ sendfileData.start = ((Long) request.getAttribute(
+ "org.apache.tomcat.sendfile.start")).longValue();
+ sendfileData.end = ((Long) request.getAttribute(
+ "org.apache.tomcat.sendfile.end")).longValue();
return true;
}
return false;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1132364&r1=1132363&r2=1132364&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sun Jun
5 10:14:15 2011
@@ -863,15 +863,18 @@ public class Http11NioProcessor extends
@Override
protected boolean prepareSendfile(OutputFilter[] outputFilters) {
- String fileName = (String)
request.getAttribute("org.apache.tomcat.sendfile.filename");
+ String fileName = (String) request.getAttribute(
+ "org.apache.tomcat.sendfile.filename");
if (fileName != null) {
// No entity body sent here
outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
contentDelimitation = true;
sendfileData = new NioEndpoint.SendfileData();
sendfileData.fileName = fileName;
- sendfileData.pos = ((Long)
request.getAttribute("org.apache.tomcat.sendfile.start")).longValue();
- sendfileData.length = ((Long)
request.getAttribute("org.apache.tomcat.sendfile.end")).longValue() -
sendfileData.pos;
+ sendfileData.pos = ((Long) request.getAttribute(
+ "org.apache.tomcat.sendfile.start")).longValue();
+ sendfileData.length = ((Long) request.getAttribute(
+ "org.apache.tomcat.sendfile.end")).longValue() -
sendfileData.pos;
return true;
}
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
