Author: markt
Date: Wed Oct 16 11:23:20 2013
New Revision: 1532726
URL: http://svn.apache.org/r1532726
Log:
Include socket reference in IOExceptions to make debugging easier
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1532720
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?rev=1532726&r1=1532725&r2=1532726&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
Wed Oct 16 11:23:20 2013
@@ -53,7 +53,7 @@ public class AprServletInputStream exten
readLock.lock();
if (wrapper.getBlockingStatus() == block) {
if (closed) {
- throw new IOException(sm.getString("apr.closed"));
+ throw new IOException(sm.getString("apr.closed",
Long.valueOf(socket)));
}
result = Socket.recv(socket, b, off, len);
readDone = true;
@@ -73,7 +73,7 @@ public class AprServletInputStream exten
readLock.lock();
writeLock.unlock();
if (closed) {
- throw new IOException(sm.getString("apr.closed"));
+ throw new IOException(sm.getString("apr.closed",
Long.valueOf(socket)));
}
result = Socket.recv(socket, b, off, len);
} finally {
@@ -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)));
+ Integer.valueOf(-result), Long.valueOf(socket)));
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1532726&r1=1532725&r2=1532726&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Wed Oct 16 11:23:20 2013
@@ -63,7 +63,7 @@ public class AprServletOutputStream exte
readLock.lock();
if (wrapper.getBlockingStatus() == block) {
if (closed) {
- throw new IOException(sm.getString("apr.closed"));
+ throw new IOException(sm.getString("apr.closed",
Long.valueOf(socket)));
}
return doWriteInternal(b, off, len);
}
@@ -86,7 +86,7 @@ public class AprServletOutputStream exte
readLock.lock();
writeLock.unlock();
if (closed) {
- throw new IOException(sm.getString("apr.closed"));
+ throw new IOException(sm.getString("apr.closed",
Long.valueOf(socket)));
}
return doWriteInternal(b, off, len);
} finally {
@@ -143,7 +143,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)));
+ Integer.valueOf(-written), Long.valueOf(socket)));
}
start += written;
left -= written;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1532726&r1=1532725&r2=1532726&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Wed Oct 16 11:23:20 2013
@@ -25,8 +25,8 @@ 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.
-apr.write.error=Unexpected error [{0}] writing data to the APR/native socket.
-apr.closed=The socket associated with this connection has been closed.
+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.closed=The socket [{0}] associated with this connection has been closed.
nio.eof.error=Unexpected EOF read on the socket
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
