svn commit: r1637931 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: AbstractServletOutputStream.java AprServletOutputStream.java Nio2ServletOutputStream.java NioServletOutputStream.java

[markt]

Author: markt
Date: Mon Nov 10 16:46:56 2014
New Revision: 1637931

URL: http://svn.apache.org/r1637931
Log:
Use close method now available in SocketWrapper

Modified:
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1637931&r1=1637930&r2=1637931&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
 Mon Nov 10 16:46:56 2014
@@ -134,7 +134,7 @@ public abstract class AbstractServletOut
     @Override
     public void close() throws IOException {
         closeRequired = true;
-        doClose();
+        socketWrapper.close();
     }
 
 
@@ -251,6 +251,4 @@ public abstract class AbstractServletOut
             throws IOException;
 
     protected abstract void doFlush() throws IOException;
-
-    protected abstract void doClose() throws IOException;
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1637931&r1=1637930&r2=1637931&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java 
Mon Nov 10 16:46:56 2014
@@ -155,12 +155,4 @@ public class AprServletOutputStream exte
     protected void doFlush() throws IOException {
         // TODO Auto-generated method stub
     }
-
-
-    @Override
-    protected void doClose() throws IOException {
-        closed = true;
-        // AbstractProcessor needs to trigger the close as multiple closes for
-        // APR/native sockets will cause problems.
-    }
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java?rev=1637931&r1=1637930&r2=1637931&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
Mon Nov 10 16:46:56 2014
@@ -179,10 +179,4 @@ public class Nio2ServletOutputStream ext
             throw ex;
         }
     }
-
-    @Override
-    protected void doClose() throws IOException {
-        channel.close(true);
-    }
-
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?rev=1637931&r1=1637930&r2=1637931&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java 
Mon Nov 10 16:46:56 2014
@@ -131,10 +131,4 @@ public class NioServletOutputStream exte
             }
         }
     }
-
-
-    @Override
-    protected void doClose() throws IOException {
-        channel.close(true);
-    }
 }



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