svn commit: r1602265 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Jun 12 18:58:09 2014
New Revision: 1602265

URL: http://svn.apache.org/r1602265
Log:
More formatting changes

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1598313

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1602265&r1=1602264&r2=1602265&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
Thu Jun 12 18:58:09 2014
@@ -235,7 +235,6 @@ public class OutputBuffer extends Writer
 
     // --------------------------------------------------------- Public Methods
 
-
     /**
      * Recycle the output buffer.
      */
@@ -328,8 +327,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);
     }
 
@@ -339,8 +337,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;
@@ -363,13 +360,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());
             }
         }
 
@@ -378,7 +373,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/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1602265&r1=1602264&r2=1602265&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Thu 
Jun 12 18:58:09 2014
@@ -562,8 +562,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org