Author: violetagg
Date: Wed Sep 17 05:37:12 2014
New Revision: 1625464
URL: http://svn.apache.org/r1625464
Log:
Merged revisions 1605821, 1605823 from tomcat/trunk:
Refactoring with a view to adding transformation (i.e. extension) support to
outgoing messages.
Extract MessagePart into standalone class
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/MessagePart.java
- copied unchanged from r1605823,
tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1605821,1605823
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=1625464&r1=1625463&r2=1625464&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 05:37:12 2014
@@ -252,7 +252,8 @@ public abstract class WsRemoteEndpointIm
wsSession.updateLastActive();
- MessagePart mp = new MessagePart(opCode, payload, last, handler, this);
+ MessagePart mp = new MessagePart(opCode, payload, last,
+ new EndMessageHandler(this, handler));
boolean doWrite = false;
synchronized (messagePartLock) {
@@ -411,42 +412,6 @@ public abstract class WsRemoteEndpointIm
}
- private static class MessagePart {
- private final byte opCode;
- private final ByteBuffer payload;
- private final boolean last;
- private final SendHandler handler;
-
- public MessagePart(byte opCode, ByteBuffer payload, boolean last,
- SendHandler handler, WsRemoteEndpointImplBase endpoint) {
- this.opCode = opCode;
- this.payload = payload;
- this.last = last;
- this.handler = new EndMessageHandler(endpoint, handler);
- }
-
-
- public byte getOpCode() {
- return opCode;
- }
-
-
- public ByteBuffer getPayload() {
- return payload;
- }
-
-
- public boolean isLast() {
- return last;
- }
-
-
- public SendHandler getHandler() {
- return handler;
- }
- }
-
-
/**
* Wraps the user provided handler so that the end point is notified when
* the message is complete.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
