[patch] fix bug 56518 on TOMCAT_7_0_54

bugfix-56518.diff (text/plain), 1.22 KB, created by hanyong on 2014-06-10 09:23:17 UTC

(hide)

Description: fix bug 56518 on TOMCAT_7_0_54

Filename:

MIME Type:

Creator: hanyong

Created: 2014-06-10 09:23:17 UTC

Size: 1.22 KB

patch

obsolete

>diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java >index 88efe27..4a87e59 100644 >--- a/java/org/apache/tomcat/util/net/NioChannel.java >+++ b/java/org/apache/tomcat/util/net/NioChannel.java >@@ -120,6 +120,8 @@ public class NioChannel implements ByteChannel{ > */ > @Override > public int write(ByteBuffer src) throws IOException { >+ // fix BZ 56518, clear thread interrupted status before write to NIO socket. >+ Thread.interrupted(); > return sc.write(src); > } > >diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java >index f0167df..ae45a38 100644 >--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java >+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java >@@ -471,6 +471,8 @@ public class SecureNioChannel extends NioChannel { > */ > @Override > public int write(ByteBuffer src) throws IOException { >+ // fix BZ 56518, clear thread interrupted status before write to NIO socket. >+ Thread.interrupted(); > if ( src == this.netOutBuffer ) { > //we can get here through a recursive call > //by using the NioBlockingSelector View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]