From da4f912c636cb915e44b27ae1f097a1ac6b9259a Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 5 Jun 2011 10:14:15 +0000 Subject: [PATCH] Reformat - no functional change. Just to aid comparison git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1132364 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 14 +++++++------- java/org/apache/coyote/http11/Http11NioProcessor.java | 9 ++++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index a9cb82f36..37fa1b224 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -820,18 +820,18 @@ public class Http11AprProcessor extends AbstractHttp11Processor { @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; diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 9c8d8c87f..469510317 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -863,15 +863,18 @@ public class Http11NioProcessor extends AbstractHttp11Processor { @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; -- 2.11.0