Author: markt
Date: Fri Feb 27 15:01:01 2015
New Revision: 1662702
URL: http://svn.apache.org/r1662702
Log:
Refactor with a view to using a common method for text and binary
blocking messages.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662702&r1=1662701&r2=1662702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Fri Feb 27 15:01:01 2015
@@ -275,7 +275,12 @@ public abstract class WsRemoteEndpointIm
} else {
timeoutExpiry = System.currentTimeMillis() + timeout;
}
+ sendMessageBlock(opCode, payload, last, timeoutExpiry);
+ }
+
+ private void sendMessageBlock(byte opCode, ByteBuffer payload, boolean
last,
+ long timeoutExpiry) throws IOException {
wsSession.updateLastActive();
BlockingSendHandler bsh = new BlockingSendHandler();
@@ -292,6 +297,7 @@ public abstract class WsRemoteEndpointIm
return;
}
+ long timeout = timeoutExpiry - System.currentTimeMillis();
synchronized (messagePartLock) {
try {
if (!messagePartInProgress.tryAcquire(timeout,
TimeUnit.MILLISECONDS)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
