/*
 *  Licensed to the Apache Software Foundation (ASF) under one or more
 *  contributor license agreements.  See the NOTICE file distributed with
 *  this work for additional information regarding copyright ownership.
 *  The ASF licenses this file to You under the Apache License, Version 2.0
 *  (the "License"); you may not use this file except in compliance with
 *  the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
package org.apache.tomcat.websocket.server;

import java.io.IOException;

import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.websocket.Transformation;
import org.apache.tomcat.websocket.WsFrameBase;
import org.apache.tomcat.websocket.WsSession;

public class WsFrameServer extends WsFrameBase {

    private final SocketWrapperBase<?> socketWrapper;
    private final Object connectionReadLock = new Object();


    public WsFrameServer(SocketWrapperBase<?> socketWrapper, WsSession wsSession,
            Transformation transformation) {
        super(wsSession, transformation);
        this.socketWrapper = socketWrapper;
    }


    /**
     * Called when there is data in the ServletInputStream to process.
     *
     * @throws IOException if an I/O error occurs while processing the available
     *                     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();
            }
        }
    }


    @Override
    protected boolean isMasked() {
        // Data is from the client so it should be masked
        return true;
    }


    @Override
    protected Transformation getTransformation() {
        // Overridden to make it visible to other classes in this package
        return super.getTransformation();
    }


    @Override
    protected boolean isOpen() {
        // Overridden to make it visible to other classes in this package
        return super.isOpen();
    }
}

@@ -1188,68 +1188,8 @@
 er;%0A
-    private final Object connectionReadLock = new Object();%0A
 %0A%0A  
@@ -1673,56 +1673,8 @@
 n %7B%0A
-        synchronized (connectionReadLock) %7B%0A    
     
@@ -1726,28 +1726,24 @@
 orRead()) %7B%0A
-    
             
@@ -1810,20 +1810,16 @@
         
- 
-   
 int read
@@ -1861,20 +1861,16 @@
         
-   
- 
 false, i
@@ -1935,20 +1935,16 @@
         
-    
 if (read
@@ -1964,28 +1964,24 @@
             
-    
 return;%0A    
@@ -1984,34 +1984,26 @@
             
-   
- 
 %7D%0A
-    
             
@@ -2032,20 +2032,16 @@
         
-    
 processI
@@ -2054,30 +2054,16 @@
 ffer();%0A
-            %7D%0A
         

Remove unnecessary code. SocketProcessor implementations lock on the socket to ensure there is only ever one thread processing the socket at a time