[activemq] branch activemq-5.15.x updated: AMQ-7166 - upgrade mqtt client library

[jgenender]

This is an automated email from the ASF dual-hosted git repository.

jgenender pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new f78c096  AMQ-7166 - upgrade mqtt client library
f78c096 is described below

commit f78c0962ffb46fae3397eed6b7ec1e6e15045031
Author: Dejan Bosanac <de...@nighttale.net>
AuthorDate: Mon Mar 11 14:44:47 2019 +0100

    AMQ-7166 - upgrade mqtt client library
---
 .../activemq/transport/mqtt/MQTTCodecTest.java     | 25 ++++++++++++++++++++++
 pom.xml                                            |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git 
a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java
 
b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java
index 097c8eb..49722d8 100644
--- 
a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java
+++ 
b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java
@@ -19,7 +19,9 @@ package org.apache.activemq.transport.mqtt;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.net.ProtocolException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -34,6 +36,7 @@ import org.fusesource.mqtt.codec.CONNECT;
 import org.fusesource.mqtt.codec.MQTTFrame;
 import org.fusesource.mqtt.codec.PUBLISH;
 import org.fusesource.mqtt.codec.SUBSCRIBE;
+import org.fusesource.mqtt.codec.UNSUBSCRIBE;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -255,6 +258,28 @@ public class MQTTCodecTest {
     }
 
     @Test
+    public void testMessageDecodingCorrupted() throws Exception {
+        UNSUBSCRIBE unsubscribe = new UNSUBSCRIBE();
+
+        MQTTFrame frame = unsubscribe.encode();
+
+        DataByteArrayOutputStream str = new DataByteArrayOutputStream(5);
+        str.write(new byte[] {0,0,0,0,0});
+
+        frame.buffers[0] = str.toBuffer();
+
+        boolean decodingFailed = false;
+        try {
+            unsubscribe.decode(frame);
+        } catch (ProtocolException pe) {
+            decodingFailed = true;
+        }
+        if (!decodingFailed) {
+            fail("Should have failed decoding the frame");
+        }
+    }
+
+    @Test
     public void testMessageDecodingPerformance() throws Exception {
 
         byte[] CONTENTS = new byte[MESSAGE_SIZE];
diff --git a/pom.xml b/pom.xml
index 3741241..2b29ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
     <mockito-version>1.10.19</mockito-version>
     <owasp-dependency-check-version>3.3.0</owasp-dependency-check-version>
     <powermock-version>1.6.5</powermock-version>
-    <mqtt-client-version>1.14</mqtt-client-version>
+    <mqtt-client-version>1.15</mqtt-client-version>
     <openjpa-version>1.2.0</openjpa-version>
     <org-apache-derby-version>10.14.2.0</org-apache-derby-version>
     <org.osgi.core-version>4.3.1</org.osgi.core-version>