tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1534544 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: AprServletInputStream.java AprServletOutputStream.java LocalStrings.properties
Date Tue, 22 Oct 2013 09:00:56 GMT
Author: markt
Date: Tue Oct 22 09:00:56 2013
New Revision: 1534544

URL: http://svn.apache.org/r1534544
Log:
Add wrapper information to error message

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?rev=1534544&r1=1534543&r2=1534544&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java Tue Oct
22 09:00:56 2013
@@ -100,7 +100,7 @@ public class AprServletInputStream exten
             throw new EOFException(sm.getString("apr.clientAbort"));
         } else {
             throw new IOException(sm.getString("apr.read.error",
-                    Integer.valueOf(-result), Long.valueOf(socket)));
+                    Integer.valueOf(-result), Long.valueOf(socket), wrapper));
         }
     }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1534544&r1=1534543&r2=1534544&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java Tue Oct
22 09:00:56 2013
@@ -141,7 +141,7 @@ public class AprServletOutputStream exte
                 throw new EOFException(sm.getString("apr.clientAbort"));
             } else if (written < 0) {
                 throw new IOException(sm.getString("apr.write.error",
-                        Integer.valueOf(-written), Long.valueOf(socket)));
+                        Integer.valueOf(-written), Long.valueOf(socket), wrapper));
             }
             start += written;
             left -= written;

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1534544&r1=1534543&r2=1534544&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties Tue Oct 22
09:00:56 2013
@@ -25,7 +25,7 @@ upgrade.sos.writeListener.null=It is ill
 upgrade.sis.write.ise=It is illegal to call any of the write() methods in non-blocking mode
without first checking that there is space available by calling isReady()
 
 apr.clientAbort=The client aborted the connection.
-apr.read.error=Unexpected error [{0}] reading data from the APR/native socket [{1}].
-apr.write.error=Unexpected error [{0}] writing data to the APR/native socket [{1}].
+apr.read.error=Unexpected error [{0}] reading data from the APR/native socket [{1}] with
wrapper [{2}].
+apr.write.error=Unexpected error [{0}] writing data to the APR/native socket [{1}] with wrapper
[{2}].
 apr.closed=The socket [{0}] associated with this connection has been closed.
 



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


Mime
View raw message