minor cleanup of variable names and ordering
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3015 7e9141cc-0065-0410-87d8-b60c137991c4
diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD06.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD06.java
index 8d870b2..2ea6082 100644
--- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD06.java
+++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD06.java
@@ -493,7 +493,7 @@
public void onFrame(byte flags, byte opcode, Buffer buffer)
{
- boolean more=(flags&0x8)==0;
+ boolean lastFrame = isLastFrame(flags);
synchronized(WebSocketConnectionD06.this)
{
@@ -528,7 +528,7 @@
if (_utf8.append(buffer.array(),buffer.getIndex(),buffer.length(),_connection.getMaxTextMessageSize()))
{
// If this is the last fragment, deliver the text buffer
- if (more && _onTextMessage!=null)
+ if (lastFrame && _onTextMessage!=null)
{
_opcode=-1;
String msg =_utf8.toString();
@@ -541,8 +541,7 @@
_connection.close(WebSocketConnectionD06.CLOSE_LARGE,"Text message size > "+_connection.getMaxTextMessageSize()+" chars");
_utf8.reset();
_opcode=-1;
- }
-
+ }
}
else if (_opcode>=0 && _connection.getMaxBinaryMessageSize()>=0)
{
@@ -557,7 +556,7 @@
_aggregate.put(buffer);
// If this is the last fragment, deliver
- if (!more && _onBinaryMessage!=null)
+ if (lastFrame && _onBinaryMessage!=null)
{
try
{
@@ -606,7 +605,12 @@
{
if(_onTextMessage!=null)
{
- if (more)
+ if (lastFrame)
+ {
+ // Deliver the message
+ _onTextMessage.onMessage(buffer.toString(StringUtil.__UTF8));
+ }
+ else
{
if (_connection.getMaxTextMessageSize()>=0)
{
@@ -621,11 +625,6 @@
}
}
}
- else
- {
- // Deliver the message
- _onTextMessage.onMessage(buffer.toString(StringUtil.__UTF8));
- }
}
break;
}
@@ -634,7 +633,11 @@
{
if (_onBinaryMessage!=null)
{
- if (more)
+ if (lastFrame)
+ {
+ _onBinaryMessage.onMessage(array,buffer.getIndex(),buffer.length());
+ }
+ else
{
if (_connection.getMaxBinaryMessageSize()>=0)
{
@@ -654,10 +657,6 @@
}
}
}
- else
- {
- _onBinaryMessage.onMessage(array,buffer.getIndex(),buffer.length());
- }
}
}
}
