svn commit: r1576241 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

[re...@apache.org]

Author: remm
Date: Tue Mar 11 09:17:34 2014
New Revision: 1576241

URL: http://svn.apache.org/r1576241
Log:
Use the behavior of the NIO connector if there is a pending write when attempting a SSL close (= throw an IOE and expect a real close).

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1576241&r1=1576240&r2=1576241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Mar 11 09:17:34 2014
@@ -408,7 +408,7 @@ public class SecureNio2Channel extends N
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             throw new IOException("Remaining data in the network buffer, can't send SSL close message, force a close with close(true) instead", e);
         } catch (WritePendingException e) {
-            // Ingore
+            throw new IOException("Pending write, so remaining data in the network buffer, can't send SSL close message, force a close with close(true) instead", e);
         }
         //prep the buffer for the close message
         netOutBuffer.clear();
@@ -428,7 +428,7 @@ public class SecureNio2Channel extends N
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             throw new IOException("Remaining data in the network buffer, can't send SSL close message, force a close with close(true) instead", e);
         } catch (WritePendingException e) {
-            // Ingore
+            throw new IOException("Pending write, so remaining data in the network buffer, can't send SSL close message, force a close with close(true) instead", e);
         }
 
         //is the channel closed?



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