components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClientFactory.java

@@ -485,8 +485,7 @@ public class TraccarClientFactory {
             String msg = "Error occurred while mapping with deviceId .";
             log.error(msg, e);
             throw new TrackerManagementDAOException(msg, e);
-        }
+        } catch (SQLException e) {
-        catch (SQLException e) {
             String msg = "Error occurred establishing the DB connection .";
             log.error(msg, e);
             throw new TrackerManagementDAOException(msg, e);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/impl/DeviceAPIClientServiceImpl.java

@@ -64,7 +64,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
 
     @Override
     public void modifyDevice(Device device, int tenantId) throws ExecutionException, InterruptedException {
-        TraccarDevice traccarDevice = new TraccarDevice(device.getId(), device.getName(), device.getDeviceIdentifier(), null,null,null,null,null,null,null,null,null);
+        TraccarDevice traccarDevice = new TraccarDevice(device.getId(), device.getDeviceIdentifier(), device.getName());
         try {
             client.modifyDevice(traccarDevice, tenantId);
         } catch (TrackerManagementDAOException e) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/beans/TraccarDevice.java

@@ -55,6 +55,12 @@ public class TraccarDevice {
         this.category =category;
     }
 
+    public TraccarDevice(int id, String deviceIdentifier, String deviceName) {
+        this.id = id;
+        this.deviceIdentifier = deviceIdentifier;
+        this.deviceName = deviceName;
+    }
+
     public TraccarDevice(){ }
 
     public int getId() { return id; }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/common/util/TraccarUtil.java

@@ -72,8 +72,6 @@ public class TraccarUtil {
         payload.put("id", id);
         payload.put("name", deviceInfo.getDeviceName());
         payload.put("uniqueId", deviceInfo.getUniqueId());
-//        add other params if needed
-//        as long as its null it wintt be overitten
         return payload;
     }
 }