activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-5997 - support legacy clients
Date Mon, 05 Oct 2015 10:55:53 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 81b4b9ae3 -> b83c38b04


https://issues.apache.org/jira/browse/AMQ-5997 - support legacy clients


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b83c38b0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b83c38b0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b83c38b0

Branch: refs/heads/master
Commit: b83c38b04c3e4330e6d5f57e4c5d7f3fd62942f0
Parents: 81b4b9a
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Mon Oct 5 12:55:25 2015 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Mon Oct 5 12:55:48 2015 +0200

----------------------------------------------------------------------
 .../org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java | 3 +++
 pom.xml                                                           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/b83c38b0/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
----------------------------------------------------------------------
diff --git a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
index b83dd27..5998938 100644
--- a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
+++ b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
@@ -376,6 +376,9 @@ public class MQTTProtocolConverter {
 
     public void onUnSubscribe(UNSUBSCRIBE command) throws MQTTProtocolException {
         checkConnected();
+        if (command.qos() != QoS.AT_LEAST_ONCE && (version != V3_1 || publishDollarTopics
!= true)) {
+            throw new MQTTProtocolException("Failed to process unsubscribe request", true,
new Exception("UNSUBSCRIBE frame not properly formatted, QoS"));
+        }
         UTF8Buffer[] topics = command.topics();
         if (topics != null) {
             for (UTF8Buffer topic : topics) {

http://git-wip-us.apache.org/repos/asf/activemq/blob/b83c38b0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b65f6fd..e9c9a00 100755
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
     <leveldbjni-version>1.8</leveldbjni-version>
     <log4j-version>1.2.17</log4j-version>
     <mockito-version>1.10.19</mockito-version>
-    <mqtt-client-version>1.11</mqtt-client-version>
+    <mqtt-client-version>1.12</mqtt-client-version>
     <openjpa-version>1.2.0</openjpa-version>
     <org-apache-derby-version>10.11.1.1</org-apache-derby-version>
     <org.osgi.core-version>4.3.1</org.osgi.core-version>


Mime
View raw message