Author: markt
Date: Thu May 29 14:55:28 2014
New Revision: 1598313
URL: http://svn.apache.org/r1598313
Log:
More formatting changes
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Response.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=1598313&r1=1598312&r2=1598313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May
29 14:55:28 2014
@@ -219,7 +219,6 @@ public class OutputBuffer extends Writer
// --------------------------------------------------------- Public Methods
-
/**
* Recycle the output buffer.
*/
@@ -310,8 +309,7 @@ public class OutputBuffer extends Writer
* @throws IOException An underlying IOException occurred
*/
@Override
- public void flush()
- throws IOException {
+ public void flush() throws IOException {
doFlush(true);
}
@@ -321,8 +319,7 @@ public class OutputBuffer extends Writer
*
* @throws IOException An underlying IOException occurred
*/
- protected void doFlush(boolean realFlush)
- throws IOException {
+ protected void doFlush(boolean realFlush) throws IOException {
if (suspended) {
return;
@@ -345,13 +342,11 @@ public class OutputBuffer extends Writer
}
if (realFlush) {
- coyoteResponse.action(ActionCode.CLIENT_FLUSH,
- coyoteResponse);
+ coyoteResponse.action(ActionCode.CLIENT_FLUSH, null);
// If some exception occurred earlier, or if some IOE occurred
// here, notify the servlet with an IOE
if (coyoteResponse.isExceptionPresent()) {
- throw new ClientAbortException
- (coyoteResponse.getErrorException());
+ throw new
ClientAbortException(coyoteResponse.getErrorException());
}
}
@@ -360,7 +355,6 @@ public class OutputBuffer extends Writer
// ------------------------------------------------- Bytes Handling Methods
-
/**
* Sends the buffer data to the client output, checking the
* state of Response and calling the right interceptors.
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=1598313&r1=1598312&r2=1598313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu May 29
14:55:28 2014
@@ -462,8 +462,7 @@ public class Response
* @exception IOException if an input/output error occurs
*/
@Override
- public void flushBuffer()
- throws IOException {
+ public void flushBuffer() throws IOException {
outputBuffer.flush();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
