Author: markt
Date: Fri Dec 11 08:54:11 2015
New Revision: 1719285
URL: http://svn.apache.org/viewvc?rev=1719285&view=rev
Log:
Remove unnecessary code.
SocketProcessor implementations lock on the socket to ensure there is only ever
one thread processing the socket at a time
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1719285&r1=1719284&r2=1719285&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Fri
Dec 11 08:54:11 2015
@@ -26,7 +26,6 @@ import org.apache.tomcat.websocket.WsSes
public class WsFrameServer extends WsFrameBase {
private final SocketWrapperBase<?> socketWrapper;
- private final Object connectionReadLock = new Object();
public WsFrameServer(SocketWrapperBase<?> socketWrapper, WsSession
wsSession,
@@ -43,17 +42,15 @@ public class WsFrameServer extends WsFra
* data
*/
public void onDataAvailable() throws IOException {
- synchronized (connectionReadLock) {
- while (isOpen() && socketWrapper.isReadyForRead()) {
- // Fill up the input buffer with as much data as we can
- int read = socketWrapper.read(
- false, inputBuffer, writePos, inputBuffer.length -
writePos);
- if (read <= 0) {
- return;
- }
- writePos += read;
- processInputBuffer();
+ while (isOpen() && socketWrapper.isReadyForRead()) {
+ // Fill up the input buffer with as much data as we can
+ int read = socketWrapper.read(
+ false, inputBuffer, writePos, inputBuffer.length -
writePos);
+ if (read <= 0) {
+ return;
}
+ writePos += read;
+ processInputBuffer();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
