svn commit: r521493 - in /tomcat/tc6.0.x/trunk: java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Thu Mar 22 15:05:22 2007
New Revision: 521493

URL: http://svn.apache.org/viewvc?view=rev&rev=521493
Log:
Catch io exceptions and hide them unless debug is enabled

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=521493&r1=521492&r2=521493
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu 
Mar 22 15:05:22 2007
@@ -1476,9 +1476,12 @@
                     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 @@
             error = false;
             fairness = 0;
             lastRegistered = 0;
+            sendfileData = null;
         }
         
         public void reset() {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=521493&r1=521492&r2=521493
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Mar 22 15:05:22 2007
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]