Author: markt
Date: Wed Jan 5 10:10:29 2011
New Revision: 1055391
URL: http://svn.apache.org/viewvc?rev=1055391&view=rev
Log:
Simplify getContentCount.
Prep for fixing bug 50496
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Wed Jan
5 10:10:29 2011
@@ -340,6 +340,7 @@ public class OutputBuffer extends Writer
*
* @throws IOException An underlying IOException occurred
*/
+ @Override
public void realWriteBytes(byte buf[], int off, int cnt)
throws IOException {
@@ -513,6 +514,7 @@ public class OutputBuffer extends Writer
conv = AccessController.doPrivileged(
new PrivilegedExceptionAction<C2BConverter>(){
+ @Override
public C2BConverter run() throws IOException{
return new C2BConverter(bb, enc);
}
@@ -547,29 +549,7 @@ public class OutputBuffer extends Writer
}
- public int getBytesWritten() {
- if (bytesWritten < Integer.MAX_VALUE) {
- return (int) bytesWritten;
- }
- return -1;
- }
-
- public int getCharsWritten() {
- if (charsWritten < Integer.MAX_VALUE) {
- return (int) charsWritten;
- }
- return -1;
- }
-
- public int getContentWritten() {
- long size = bytesWritten + charsWritten ;
- if (size < Integer.MAX_VALUE) {
- return (int) size;
- }
- return -1;
- }
-
- public long getContentWrittenLong() {
+ public long getContentWritten() {
return bytesWritten + charsWritten;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Wed Jan 5
10:10:29 2011
@@ -310,16 +310,9 @@ public class Response
/**
* Return the number of bytes actually written to the output stream.
*/
- public int getContentCount() {
+ public long getContentCount() {
return outputBuffer.getContentWritten();
}
-
- /**
- * Return the number of bytes actually written to the output stream.
- */
- public long getContentCountLong() {
- return outputBuffer.getContentWrittenLong();
- }
/**
* Set the application commit flag.
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Jan 5
10:10:29 2011
@@ -1057,7 +1057,7 @@ public class AccessLogValve extends Valv
@Override
public void addElement(StringBuilder buf, Date date, Request request,
Response response, long time) {
- long length = response.getContentCountLong() ;
+ long length = response.getContentCount() ;
if (length <= 0 && conversion) {
buf.append('-');
} else {
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Jan
5 10:10:29 2011
@@ -165,7 +165,7 @@ public class ErrorReportValve extends Va
// Do nothing on a 1xx, 2xx and 3xx status
// Do nothing if anything has been written already
- if ((statusCode < 400) || (response.getContentCountLong() > 0))
+ if ((statusCode < 400) || (response.getContentCount() > 0))
return;
String message = RequestUtil.filter(response.getMessage());
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1055391&r1=1055390&r2=1055391&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed
Jan 5 10:10:29 2011
@@ -464,7 +464,7 @@ public final class JDBCAccessLogValve ex
String user = request.getRemoteUser();
String query=request.getRequestURI();
- long bytes = response.getContentCountLong() ;
+ long bytes = response.getContentCount() ;
if(bytes < 0)
bytes = 0;
int status = response.getStatus();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
