Author: markt
Date: Mon Nov 10 16:46:27 2014
New Revision: 1637927
URL: http://svn.apache.org/r1637927
Log:
Add missing messages
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1637927&r1=1637926&r2=1637927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov 10
16:46:27 2014
@@ -2378,7 +2378,7 @@ public class AprEndpoint extends Abstrac
throws IOException {
if (closed) {
- throw new IOException(sm.getString("apr.closed", getSocket()));
+ throw new IOException(sm.getString("socket.apr.closed",
getSocket()));
}
if (leftOverInput != null) {
@@ -2441,18 +2441,18 @@ public class AprEndpoint extends Abstrac
// identified any issues with this but log it so it can be
tracked
// if it is suspected of causing issues in the future.
if (log.isDebugEnabled()) {
- log.debug(sm.getString("apr.read.sslGeneralError",
getSocket(), this));
+ log.debug(sm.getString("socket.apr.read.sslGeneralError",
getSocket(), this));
}
eagain = true;
return 0;
} else if (-result == Status.APR_EOF) {
- throw new EOFException(sm.getString("apr.clientAbort"));
+ throw new EOFException(sm.getString("socket.apr.clientAbort"));
} else if ((OS.IS_WIN32 || OS.IS_WIN64) &&
(-result == Status.APR_OS_START_SYSERR + 10053)) {
// 10053 on Windows is connection aborted
- throw new EOFException(sm.getString("apr.clientAbort"));
+ throw new EOFException(sm.getString("socket.apr.clientAbort"));
} else {
- throw new IOException(sm.getString("apr.read.error",
+ throw new IOException(sm.getString("socket.apr.read.error",
Integer.valueOf(-result), getSocket(), this));
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1637927&r1=1637926&r2=1637927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Nov 10 16:46:27 2014
@@ -83,3 +83,10 @@ channel.nio.ssl.wrapFail=Unable to wrap
channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete
handshake before reading data.
channel.nio.ssl.closing=Channel is in closing state.
channel.nio.ssl.invalidBuffer=You can only read using the application read
buffer provided by the handler.
+
+socket.apr.clientAbort=The client aborted the connection.
+socket.apr.read.error=Unexpected error [{0}] reading data from the APR/native
socket [{1}] with wrapper [{2}].
+socket.apr.read.sslGeneralError=An APR general error was returned by the SSL
read operation on APR/native socket [{0}] with wrapper [{1}]. It will be
treated as EAGAIN and the socket returned to the poller.
+socket.apr.write.error=Unexpected error [{0}] writing data to the APR/native
socket [{1}] with wrapper [{2}].
+socket.apr.closed=The socket [{0}] associated with this connection has been
closed.
+
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
