svn commit: r1625475 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/MessagePart.java java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[violetagg]

Author: violetagg
Date: Wed Sep 17 07:26:14 2014
New Revision: 1625475

URL: http://svn.apache.org/r1625475
Log:
Merged revisions 1618832, 1618833 from tomcat/trunk:
- Reduce visibility
- Rename to align with RFC 6455 terms

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1618832-1618833

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java?rev=1625475&r1=1625474&r2=1625475&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java Wed 
Sep 17 07:26:14 2014
@@ -20,17 +20,17 @@ import java.nio.ByteBuffer;
 
 import javax.websocket.SendHandler;
 
-public class MessagePart {
+class MessagePart {
     private final byte opCode;
     private final ByteBuffer payload;
-    private final boolean last;
+    private final boolean fin;
     private final SendHandler handler;
 
-    public MessagePart(byte opCode, ByteBuffer payload, boolean last,
+    public MessagePart(byte opCode, ByteBuffer payload, boolean fin,
             SendHandler handler) {
         this.opCode = opCode;
         this.payload = payload;
-        this.last = last;
+        this.fin = fin;
         this.handler = handler;
     }
 
@@ -45,8 +45,8 @@ public class MessagePart {
     }
 
 
-    public boolean isLast() {
-        return last;
+    public boolean isFin() {
+        return fin;
     }
 
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1625475&r1=1625474&r2=1625475&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
 Wed Sep 17 07:26:14 2014
@@ -370,11 +370,11 @@ public abstract class WsRemoteEndpointIm
                             sm.getString("wsRemoteEndpoint.changeType"));
                 }
                 nextText = text;
-                nextFragmented = !mp.isLast();
+                nextFragmented = !mp.isFin();
                 first = false;
             } else {
                 // Wasn't fragmented. Might be now
-                if (mp.isLast()) {
+                if (mp.isFin()) {
                     nextFragmented = false;
                 } else {
                     nextFragmented = true;
@@ -394,7 +394,7 @@ public abstract class WsRemoteEndpointIm
 
         headerBuffer.clear();
         writeHeader(headerBuffer, mp.getOpCode(), mp.getPayload(), first,
-                mp.isLast(), isMasked(), mask);
+                mp.isFin(), isMasked(), mask);
         headerBuffer.flip();
 
         if (getBatchingAllowed() || isMasked()) {



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