You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/09 09:21:01 UTC

[1/2] camel git commit: fix CAMEL-11691

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x ea5905cff -> 47dd43e35
  refs/heads/master 6176e415a -> 3a478cb0b


fix CAMEL-11691


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

Branch: refs/heads/master
Commit: 3a478cb0b50de604ac0c3d9d704f7069c4a82620
Parents: 6176e41
Author: abccbaandy <ab...@gmail.com>
Authored: Sat Sep 9 16:56:24 2017 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 9 11:18:10 2017 +0200

----------------------------------------------------------------------
 .../camel/component/paho/PahoConsumer.java       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3a478cb0/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
index 75d6092..b273cee 100644
--- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
+++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
@@ -22,7 +22,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttCallbackExtended;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,8 +40,20 @@ public class PahoConsumer extends DefaultConsumer {
     protected void doStart() throws Exception {
         super.doStart();
         String topic = getEndpoint().getTopic();
-        getEndpoint().getClient().subscribe(topic);
-        getEndpoint().getClient().setCallback(new MqttCallback() {
+        getEndpoint().getClient().subscribe(topic, getEndpoint().getQos());
+        getEndpoint().getClient().setCallback(new MqttCallbackExtended() {
+
+            @Override
+            public void connectComplete(boolean reconnect, String serverURI) {
+                if (reconnect) {
+                    try {
+                        getEndpoint().getClient().subscribe(topic, getEndpoint().getQos());
+                    } catch (MqttException e) {
+                        LOG.error("MQTT resubscribe failed " + e.getMessage(), e);
+                    }
+                }
+            }
+
             @Override
             public void connectionLost(Throwable cause) {
                 LOG.debug("MQTT broker connection lost due " + cause.getMessage(), cause);


[2/2] camel git commit: fix CAMEL-11691

Posted by da...@apache.org.
fix CAMEL-11691


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

Branch: refs/heads/camel-2.19.x
Commit: 47dd43e35dea54adbade66954cffd768b2c24ab9
Parents: ea5905c
Author: abccbaandy <ab...@gmail.com>
Authored: Sat Sep 9 16:56:24 2017 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 9 11:19:03 2017 +0200

----------------------------------------------------------------------
 .../camel/component/paho/PahoConsumer.java       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/47dd43e3/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
index 75d6092..b273cee 100644
--- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
+++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConsumer.java
@@ -22,7 +22,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttCallbackExtended;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,8 +40,20 @@ public class PahoConsumer extends DefaultConsumer {
     protected void doStart() throws Exception {
         super.doStart();
         String topic = getEndpoint().getTopic();
-        getEndpoint().getClient().subscribe(topic);
-        getEndpoint().getClient().setCallback(new MqttCallback() {
+        getEndpoint().getClient().subscribe(topic, getEndpoint().getQos());
+        getEndpoint().getClient().setCallback(new MqttCallbackExtended() {
+
+            @Override
+            public void connectComplete(boolean reconnect, String serverURI) {
+                if (reconnect) {
+                    try {
+                        getEndpoint().getClient().subscribe(topic, getEndpoint().getQos());
+                    } catch (MqttException e) {
+                        LOG.error("MQTT resubscribe failed " + e.getMessage(), e);
+                    }
+                }
+            }
+
             @Override
             public void connectionLost(Throwable cause) {
                 LOG.debug("MQTT broker connection lost due " + cause.getMessage(), cause);