Author: markt
Date: Wed Jul 10 19:03:59 2013
New Revision: 1501915
URL: http://svn.apache.org/r1501915
Log:
Further improvements to error message to aid debugging
https://issues.apache.org/bugzilla/show_bug.cgi?id=55233
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1501915&r1=1501914&r2=1501915&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Wed Jul 10 19:03:59 2013
@@ -296,8 +296,8 @@ public class AsyncChannelWrapperSecure i
// store all of the data
throw new IOException(sm.getString(
"asyncChannelWrapperSecure.readOverflow",
- Integer.valueOf(
- socketReadBuffer.remaining()),
+ Integer.valueOf( sslEngine.getSession().
+ getApplicationBufferSize()),
Integer.valueOf(dest.limit()),
Integer.valueOf(dest.position())));
} else {
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1501915&r1=1501914&r2=1501915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed
Jul 10 19:03:59 2013
@@ -17,7 +17,7 @@ asyncChannelWrapperSecure.closeFail=Fail
asyncChannelWrapperSecure.concurrentRead=Concurrent read operations are not
permitted
asyncChannelWrapperSecure.concurrentWrite=Concurrent write operations are not
permitted
asyncChannelWrapperSecure.eof=Unexpected end of stream
-asyncChannelWrapperSecure.readOverflow=Buffer overflow unwrapping [{0}] bytes
into a [{1}] byte buffer that already contained [{2}] bytes.
+asyncChannelWrapperSecure.readOverflow=Buffer overflow. [{0}] bytes to write
into a [{1}] byte buffer that already contained [{2}] bytes.
asyncChannelWrapperSecure.statusUnwrap=Unexpected Status of SSLEngineResult
after an unwrap() operation
asyncChannelWrapperSecure.statusWrap=Unexpected Status of SSLEngineResult
after a wrap() operation
asyncChannelWrapperSecure.tooBig=The result [{0}] is too big to be expressed
as an Integer
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
