Author: markt
Date: Tue Aug 19 10:39:40 2014
New Revision: 1618833
URL: http://svn.apache.org/r1618833
Log:
Rename to align with RFC 6455 terms
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java?rev=1618833&r1=1618832&r2=1618833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java Tue Aug 19
10:39:40 2014
@@ -23,14 +23,14 @@ import javax.websocket.SendHandler;
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 @@ class MessagePart {
}
- public boolean isLast() {
- return last;
+ public boolean isFin() {
+ return fin;
}
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=1618833&r1=1618832&r2=1618833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Tue Aug 19 10:39:40 2014
@@ -367,11 +367,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;
@@ -391,7 +391,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: [email protected]
For additional commands, e-mail: [email protected]
