Merge branch 'master' into 'master'

Update device property table in dm db when updating properties

See merge request entgra/carbon-device-mgt!804

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java

@@ -489,13 +489,14 @@ public class DeviceTypeManager implements DeviceManager {
             throws DeviceManagementException {
         boolean status = false;
         if (propertiesExist) {
-            try {
-                if (log.isDebugEnabled()) {
-                    log.debug("Getting the details of " + deviceType + " device : '" + deviceId.getId() + "'");
-                }
             Device updatedDevice = new Device();
             updatedDevice.setDeviceIdentifier(deviceId.getId());
             updatedDevice.setProperties(propertyList);
+            try {
+                if (log.isDebugEnabled()) {
+                    log.debug("Updating device properties of " + deviceType + " device : '"
+                            + deviceId.getId() + "'");
+                }
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().beginTransaction();
                 status = deviceTypePluginDAOManager.getDeviceDAO().updateDevice(updatedDevice);
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().commitTransaction();
@@ -506,6 +507,24 @@ public class DeviceTypeManager implements DeviceManager {
             } finally {
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().closeConnection();
             }
+            if (propertyBasedDeviceTypePluginDAOManager != null && status) {
+                try {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Updating device properties of " + deviceType + " device : '"
+                                + deviceId.getId() + "'");
+                    }
+                    propertyBasedDeviceTypePluginDAOManager.getDeviceTypeDAOHandler().beginTransaction();
+                    status = propertyBasedDeviceTypePluginDAOManager.getDeviceDAO().updateDevice(updatedDevice);
+                    propertyBasedDeviceTypePluginDAOManager.getDeviceTypeDAOHandler().commitTransaction();
+                } catch (DeviceTypeMgtPluginException e) {
+                    propertyBasedDeviceTypePluginDAOManager.getDeviceTypeDAOHandler().rollbackTransaction();
+                    String msg = "Error while updating properties for " + deviceType + " device : " +
+                            deviceId.getId();
+                    throw new DeviceManagementException(msg, e);
+                } finally {
+                    propertyBasedDeviceTypePluginDAOManager.getDeviceTypeDAOHandler().closeConnection();
+                }
+            }
         }
         return status;
     }