Author: markt
Date: Mon Nov 10 16:48:08 2014
New Revision: 1637942
URL: http://svn.apache.org/r1637942
Log:
Align message naming
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
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=1637942&r1=1637941&r2=1637942&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Mon Nov 10 16:48:08 2014
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
-abstractProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
+upgradeProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
+upgradeProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
upgrade.sis.isReady.ise=It is illegal to call isReady() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
@@ -26,9 +26,3 @@ upgrade.sos.writeListener.null=It is ill
upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more
than once for the same upgraded connection
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}] with wrapper [{2}].
-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.
-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.
-
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1637942&r1=1637941&r2=1637942&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Mon Nov 10 16:48:08 2014
@@ -105,12 +105,12 @@ public class UpgradeProcessor<S> impleme
try {
upgradeServletInputStream.close();
} catch (IOException ioe) {
- log.debug(sm.getString("abstractProcessor.isCloseFail", ioe));
+ log.debug(sm.getString("upgradeProcessor.isCloseFail", ioe));
}
try {
upgradeServletOutputStream.close();
} catch (IOException ioe) {
- log.debug(sm.getString("abstractProcessor.osCloseFail", ioe));
+ log.debug(sm.getString("upgradeProcessor.osCloseFail", ioe));
}
return SocketState.CLOSED;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
