Author: violetagg
Date: Sat Sep 13 04:36:06 2014
New Revision: 1624696
URL: http://svn.apache.org/r1624696
Log:
Merged revision 1589523 from tomcat/trunk:
Add session ID to the exception message to aid debugging.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1589523
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1624696&r1=1624695&r2=1624696&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Sat Sep 13 04:36:06 2014
@@ -71,7 +71,7 @@ wsRemoteEndpoint.wrongState=The remote e
# as many as 4 bytes.
wsSession.timeout=The WebSocket session timeout expired
-wsSession.closed=The WebSocket session has been closed and no method (apart
from close()) may be called on a closed session
+wsSession.closed=The WebSocket session [{0}] has been closed and no method
(apart from close()) may be called on a closed session
wsSession.duplicateHandlerBinary=A binary message handler has already been
configured
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
wsSession.duplicateHandlerText=A text message handler has already been
configured
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1624696&r1=1624695&r2=1624696&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Sat
Sep 13 04:36:06 2014
@@ -650,7 +650,7 @@ public class WsSession implements Sessio
private void checkState() {
if (state == State.CLOSED) {
- throw new IllegalStateException(sm.getString("wsSession.closed"));
+ throw new IllegalStateException(sm.getString("wsSession.closed",
id));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
