tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1478941 - in /tomcat/trunk/java/org/apache/coyote/http11: InternalNioInputBuffer.java LocalStrings.properties
Date Fri, 03 May 2013 19:30:06 GMT
Author: markt
Date: Fri May  3 19:30:01 2013
New Revision: 1478941

URL: http://svn.apache.org/r1478941
Log:
Another small TODO.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1478941&r1=1478940&r2=1478941&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Fri May  3 19:30:01
2013
@@ -172,13 +172,14 @@ public class InternalNioInputBuffer exte
         }
         try {
             available = nbRead();
-        }catch (IOException x) {
-            //TODO SERVLET 3.1 -
-            //we should not swallow this exception
-
+        }catch (IOException ioe) {
             if (log.isDebugEnabled()) {
-                log.debug("Unable to issue non blocking read.", x);
+                log.debug(sm.getString("iib.available.readFail"), ioe);
             }
+            // Not ideal. This will indicate that data is available which should
+            // trigger a read which in turn will trigger another IOException and
+            // that one can be thrown.
+            available = 1;
         }
         return available;
     }

Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1478941&r1=1478940&r2=1478941&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Fri May  3 19:30:01
2013
@@ -26,6 +26,7 @@ http11processor.comet.notsupported=The C
 http11processor.sendfile.error=Error sending data using sendfile. May be caused by invalid
request attributes for start/end points
 http11Processor.upgrade=An internal error has occurred as upgraded connections should only
be processed by the dedicated upgrade processor implementations
 
+iib.available.readFail=A non-blocking read failed while attempting to determine if data was
available
 iib.eof.error=Unexpected EOF read on the socket
 iib.filter.npe=You may not add a null filter
 iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 2616 and has been ignored.



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


Mime
View raw message