svn commit: r1596362 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java

[markt]

Author: markt
Date: Tue May 20 18:44:52 2014
New Revision: 1596362

URL: http://svn.apache.org/r1596362
Log:
Backport of r1575910
Better align 7.0.x with trunk to aid back-ports

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java

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

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596362&r1=1596361&r2=1596362&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
 Tue May 20 18:44:52 2014
@@ -155,17 +155,17 @@ public abstract class AbstractServletOut
 
 
     protected final void onWritePossible() throws IOException {
-        synchronized (writeLock) {
-            try {
+        try {
+            synchronized (writeLock) {
                 writeInternal(buffer, 0, buffer.length);
-            } catch (Throwable t) {
-                ExceptionUtils.handleThrowable(t);
-                onError(t);
-                if (t instanceof IOException) {
-                    throw (IOException) t;
-                } else {
-                    throw new IOException(t);
-                }
+            }
+        } catch (Throwable t) {
+            ExceptionUtils.handleThrowable(t);
+            onError(t);
+            if (t instanceof IOException) {
+                throw (IOException) t;
+            } else {
+                throw new IOException(t);
             }
         }
 
@@ -210,7 +210,7 @@ public abstract class AbstractServletOut
      * Abstract method to be overridden by concrete implementations. The base
      * class will ensure that there are no concurrent calls to this method for
      * the same socket by ensuring that the writeLock is held when making any
-     * calls this method.
+     * calls to this method.
      */
     protected abstract int doWrite(boolean block, byte[] b, int off, int len)
             throws IOException;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org