Author: violetagg
Date: Wed Sep 17 08:08:40 2014
New Revision: 1625479
URL: http://svn.apache.org/r1625479
Log:
Merged revision 1618834 from tomcat/trunk:
Add rsv to MessagePart and re-order constructor to match order elements
are used in RFC 6455
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:r1618834
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=1625479&r1=1625478&r2=1625479&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 08:08:40 2014
@@ -21,20 +21,32 @@ import java.nio.ByteBuffer;
import javax.websocket.SendHandler;
class MessagePart {
+ private final boolean fin;
+ private final int rsv;
private final byte opCode;
private final ByteBuffer payload;
- private final boolean fin;
private final SendHandler handler;
- public MessagePart(byte opCode, ByteBuffer payload, boolean fin,
+ public MessagePart( boolean fin, int rsv, byte opCode, ByteBuffer payload,
SendHandler handler) {
+ this.fin = fin;
+ this.rsv = rsv;
this.opCode = opCode;
this.payload = payload;
- this.fin = fin;
this.handler = handler;
}
+ public boolean isFin() {
+ return fin;
+ }
+
+
+ public int getRsv() {
+ return rsv;
+ }
+
+
public byte getOpCode() {
return opCode;
}
@@ -45,11 +57,6 @@ class MessagePart {
}
- public boolean isFin() {
- return fin;
- }
-
-
public SendHandler getHandler() {
return handler;
}
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=1625479&r1=1625478&r2=1625479&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 08:08:40 2014
@@ -260,7 +260,7 @@ public abstract class WsRemoteEndpointIm
wsSession.updateLastActive();
List<MessagePart> messageParts = new ArrayList<MessagePart>();
- messageParts.add(new MessagePart(opCode, payload, last,
+ messageParts.add(new MessagePart(last, 0, opCode, payload,
new EndMessageHandler(this, handler)));
messageParts = transformation.sendMessagePart(messageParts);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
