Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5389 

https://issues.apache.org/jira/browse/AMQ-5387

Fixes some issues around processing of back to back frames and reading
of null blocks between messages.
This commit is contained in:
Timothy Bish 2014-10-21 17:14:29 -04:00
parent 6c4f15e220
commit d9d9d5b666
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTCodec.java
View File

@ -109,8 +109,7 @@ public class MQTTCodec {
@Override
public void parse(DataByteArrayInputStream data, int readSize) throws IOException {
int i = 0;
while (i++ < readSize) {
while (readSize-- > 0) {
byte b = data.readByte();
// skip repeating nulls
if (b == 0) {
@ -120,8 +119,8 @@ public class MQTTCodec {
header = b;
currentParser = initializeVariableLengthParser();
if (readSize > 1) {
currentParser.parse(data, readSize - 1);
if (readSize > 0) {
currentParser.parse(data, readSize);
}
return;
}
@ -194,7 +193,7 @@ public class MQTTCodec {
if (payLoadRead == contentLength) {
processCommand();
currentParser = initializeHeaderParser();
readSize = readSize - payLoadRead;
readSize = readSize - length;
if (readSize > 0) {
currentParser.parse(data, readSize);
}