Author: markt
Date: Tue Feb 23 14:06:38 2016
New Revision: 1731859
URL: http://svn.apache.org/viewvc?rev=1731859&view=rev
Log:
Clean-up / sync with 9.0.x. Primarily to aid 8.0.x vs 9.0.x diff.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1731859&r1=1731858&r2=1731859&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Tue
Feb 23 14:06:38 2016
@@ -60,8 +60,7 @@ public class WsSession implements Sessio
// An ellipsis is three bytes in UTF-8
private static final int ELLIPSIS_BYTES_LEN = ELLIPSIS_BYTES.length;
- private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ private static final StringManager sm =
StringManager.getManager(WsSession.class);
private static AtomicLong ids = new AtomicLong(0);
private final Log log = LogFactory.getLog(WsSession.class);
@@ -460,9 +459,11 @@ public class WsSession implements Sessio
* WebSocket 1.0. Section 2.1.5.
* Need internal close method as spec requires that the local endpoint
* receives a 1006 on timeout.
+ *
+ * @param closeReasonMessage The close reason to pass to the remote
endpoint
+ * @param closeReasonLocal The close reason to pass to the local endpoint
*/
- public void doClose(CloseReason closeReasonMessage,
- CloseReason closeReasonLocal) {
+ public void doClose(CloseReason closeReasonMessage, CloseReason
closeReasonLocal) {
// Double-checked locking. OK because state is volatile
if (state != State.OPEN) {
return;
@@ -607,6 +608,8 @@ public class WsSession implements Sessio
/**
* Use protected so unit tests can access this method directly.
+ * @param msg The message
+ * @param reason The reason
*/
protected static void appendCloseReasonWithTruncation(ByteBuffer msg,
String reason) {
@@ -670,6 +673,7 @@ public class WsSession implements Sessio
/**
* Remove a {@link FutureToSendHandler} from the set of tracked instances.
+ * @param f2sh The handler
*/
protected void unregisterFuture(FutureToSendHandler f2sh) {
futures.remove(f2sh);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
