Catch io exceptions and hide them unless debug is enabled

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@521493 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index c527bf3..474d550 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1476,9 +1476,12 @@ public class NioEndpoint {
                     else 
                         cancelledKey(sk,SocketStatus.STOP,false);
                 }
+            }catch ( IOException x ) {
+                if ( log.isDebugEnabled() ) log.warn("Unable to complete send file", x);
+                cancelledKey(sk,SocketStatus.ERROR,false);
             }catch ( Throwable t ) {
                 log.error("",t);
-                cancelledKey(sk, SocketStatus.ERROR);
+                cancelledKey(sk, SocketStatus.ERROR, false);
             }
         }
 
@@ -1549,6 +1552,7 @@ public class NioEndpoint {
             error = false;
             fairness = 0;
             lastRegistered = 0;
+            sendfileData = null;
         }
         
         public void reset() {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 12c95b5..9bd7fd7 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -18,6 +18,9 @@
   <subsection name="Catalina">
     <changelog>
       <add>
+        Added SENDFILE support for the NIO connector. (fhanik)
+      </add>
+      <add>
         Added support for shared thread pools by adding in the &lt;Executor&gt;
         element as a nested element to the &lt;Service&gt; element. (fhanik)
       </add>