svn commit: r1662700 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsRemoteEndpointImplBase.java WsSession.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:52 2015
New Revision: 1662700

URL: http://svn.apache.org/r1662700
Log:
Rename now blocking happens in-line

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
    tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.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=1662700&r1=1662699&r2=1662700&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:00:52 2015
@@ -123,7 +123,7 @@ public abstract class WsRemoteEndpointIm
 
     @Override
     public void flushBatch() throws IOException {
-        startMessageBlock(Constants.INTERNAL_OPCODE_FLUSH, null, true);
+        sendMessageBlock(Constants.INTERNAL_OPCODE_FLUSH, null, true);
     }
 
 
@@ -132,7 +132,7 @@ public abstract class WsRemoteEndpointIm
             throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
         }
         stateMachine.binaryStart();
-        startMessageBlock(Constants.OPCODE_BINARY, data, true);
+        sendMessageBlock(Constants.OPCODE_BINARY, data, true);
         stateMachine.complete(true);
     }
 
@@ -163,7 +163,7 @@ public abstract class WsRemoteEndpointIm
             throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
         }
         stateMachine.binaryPartialStart();
-        startMessageBlock(Constants.OPCODE_BINARY, partialByte, last);
+        sendMessageBlock(Constants.OPCODE_BINARY, partialByte, last);
         stateMachine.complete(last);
     }
 
@@ -174,7 +174,7 @@ public abstract class WsRemoteEndpointIm
         if (applicationData.remaining() > 125) {
             throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.tooMuchData"));
         }
-        startMessageBlock(Constants.OPCODE_PING, applicationData, true);
+        sendMessageBlock(Constants.OPCODE_PING, applicationData, true);
     }
 
 
@@ -184,7 +184,7 @@ public abstract class WsRemoteEndpointIm
         if (applicationData.remaining() > 125) {
             throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.tooMuchData"));
         }
-        startMessageBlock(Constants.OPCODE_PONG, applicationData, true);
+        sendMessageBlock(Constants.OPCODE_PONG, applicationData, true);
     }
 
 
@@ -263,7 +263,7 @@ public abstract class WsRemoteEndpointIm
     }
 
 
-    void startMessageBlock(byte opCode, ByteBuffer payload, boolean last)
+    void sendMessageBlock(byte opCode, ByteBuffer payload, boolean last)
             throws IOException {
         // Get the timeout before we send the message. The message may
         // trigger a session close and depending on timing the client
@@ -1000,7 +1000,7 @@ public abstract class WsRemoteEndpointIm
         private void doWrite(boolean last) throws IOException {
             if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || used) {
                 buffer.flip();
-                endpoint.startMessageBlock(Constants.OPCODE_BINARY, buffer, 
last);
+                endpoint.sendMessageBlock(Constants.OPCODE_BINARY, buffer, 
last);
             }
             endpoint.stateMachine.complete(last);
             buffer.clear();

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1662700&r1=1662699&r2=1662700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 27 
15:00:52 2015
@@ -567,7 +567,7 @@ public class WsSession implements Sessio
         }
         msg.flip();
         try {
-            wsRemoteEndpoint.startMessageBlock(
+            wsRemoteEndpoint.sendMessageBlock(
                     Constants.OPCODE_CLOSE, msg, true);
         } catch (IOException ioe) {
             // Failed to send close message. Close the socket and let the 
caller



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org