Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/mqtt/util/MQTTAdapterListener.java

@@ -263,11 +263,11 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
 
     @Override
     public void run() {
+        int connectionDuration = MQTTEventAdapterConstants.initialReconnectDuration;
         while (!connectionSucceeded) {
             try {
-                MQTTEventAdapterConstants.initialReconnectDuration = MQTTEventAdapterConstants.initialReconnectDuration
+                connectionDuration = connectionDuration * MQTTEventAdapterConstants.reconnectionProgressionFactor;
-                        * MQTTEventAdapterConstants.reconnectionProgressionFactor;
+                Thread.sleep(connectionDuration);
-                Thread.sleep(MQTTEventAdapterConstants.initialReconnectDuration);
                 startListener();
                 connectionSucceeded = true;
                 log.info("MQTT Connection successful");

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/mqtt/util/MQTTEventAdapterConstants.java

@@ -48,7 +48,7 @@ public class MQTTEventAdapterConstants {
     public static final int ADAPTER_CONF_DEFAULT_KEEP_ALIVE = 60000;
 
     public static int initialReconnectDuration = 2000;
-    public static final int reconnectionProgressionFactor = 4;
+    public static final int reconnectionProgressionFactor = 2;
 
     public static final String EMPTY_STRING = "";
     public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer refresh_token";

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/xmpp/util/XMPPAdapterListener.java

@@ -203,10 +203,10 @@ public class XMPPAdapterListener implements Runnable {
     @Override
     public void run() {
         while (!connectionSucceeded) {
+            int connectionDuration = XMPPEventAdapterConstants.initialReconnectDuration;
             try {
-                XMPPEventAdapterConstants.initialReconnectDuration = XMPPEventAdapterConstants.initialReconnectDuration
+                connectionDuration = connectionDuration * XMPPEventAdapterConstants.reconnectionProgressionFactor;
-                        * XMPPEventAdapterConstants.reconnectionProgressionFactor;
+                Thread.sleep(connectionDuration);
-                Thread.sleep(XMPPEventAdapterConstants.initialReconnectDuration);
                 startListener();
                 connectionSucceeded = true;
                 log.info("XMPP Connection successful");

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/xmpp/util/XMPPEventAdapterConstants.java

@@ -50,7 +50,7 @@ public class XMPPEventAdapterConstants {
     public static final int DEFAULT_TIMEOUT_INTERVAL = 5000;
 
     public static int initialReconnectDuration = 2000;
-    public static final int reconnectionProgressionFactor = 4;
+    public static final int reconnectionProgressionFactor = 2;
 
     public static final String DEFAULT = "default";