From 94475d2b043f52fc0642c50bab8f00de1a43bd01 Mon Sep 17 00:00:00 2001 From: Andreas Mager Date: Thu, 26 Jan 2017 17:19:12 +0100 Subject: [PATCH 1/2] ProtocolProcessorTest#testCleanRetainedStoreAfterAQoS0AndRetainedTrue: check added if test is in the correct state --- .../io/moquette/spi/impl/ProtocolProcessorTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java index 95a27cf4..825661b6 100644 --- a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java @@ -461,7 +461,14 @@ public class ProtocolProcessorTest { .messageId(100) .build(); m_processor.processPublish(m_channel, msg); - + + Collection messages = m_messagesStore.searchMatching(new IMatchingCondition() { + public boolean match(String key) { + return SubscriptionsStore.matchTopics(key, FAKE_TOPIC); + } + }); + assertFalse(messages.isEmpty()); + //Exercise MqttPublishMessage cleanPubMsg = MessageBuilder.publish() .topicName(FAKE_TOPIC) @@ -473,7 +480,7 @@ public class ProtocolProcessorTest { m_processor.processPublish(m_channel, cleanPubMsg); //Verify - Collection messages = m_messagesStore.searchMatching(new IMatchingCondition() { + messages = m_messagesStore.searchMatching(new IMatchingCondition() { public boolean match(String key) { return SubscriptionsStore.matchTopics(key, FAKE_TOPIC); } From bdaac34a338b5b8516bc89cc15d247d6ab6a5896 Mon Sep 17 00:00:00 2001 From: Andreas Mager Date: Thu, 26 Jan 2017 17:19:55 +0100 Subject: [PATCH 2/2] PublishMessage#getPayload: returns duplicate for safety --- .../java/io/moquette/parser/proto/messages/PublishMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java index cbe5ec2b..6afd83ab 100644 --- a/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java +++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java @@ -42,7 +42,7 @@ public class PublishMessage extends MessageIDMessage { } public ByteBuffer getPayload() { - return m_payload; + return m_payload.duplicate(); } public void setPayload(ByteBuffer payload) {