From 529bde822c5e64f3d0d83f7bd2be6a6cbf4e11f2 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Thu, 1 Dec 2016 09:12:33 +0530 Subject: [PATCH] fixing property string mapper issue --- .../deployer/template/dao/DeviceTypePluginDAO.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java index 79d60be5da..ee4f6071b7 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/dao/DeviceTypePluginDAO.java @@ -69,7 +69,7 @@ public class DeviceTypePluginDAO { device = new Device(); if (log.isDebugEnabled()) { log.debug(deviceId + " data has been fetched from " + deviceDAODefinition.getDeviceTableName() + - " database."); + " database."); } List properties = new ArrayList<>(); for (String columnName : deviceDAODefinition.getColumnNames()) { @@ -112,7 +112,7 @@ public class DeviceTypePluginDAO { status = true; if (log.isDebugEnabled()) { log.debug("device " + device.getDeviceIdentifier() + " data has been" + - " added to the " + deviceDAODefinition.getDeviceTableName() + " database."); + " added to the " + deviceDAODefinition.getDeviceTableName() + " database."); } } } catch (SQLException e) { @@ -170,7 +170,7 @@ public class DeviceTypePluginDAO { status = true; if (log.isDebugEnabled()) { log.debug("device " + deviceId + " data has deleted from the " + - deviceDAODefinition.getDeviceTableName() + " table."); + deviceDAODefinition.getDeviceTableName() + " table."); } } } catch (SQLException e) { @@ -241,7 +241,7 @@ public class DeviceTypePluginDAO { private String getPropertString(List properties, String propertyName) { for (Device.Property property : properties) { - if (property.getName().equals(propertyName)) { + if (property.getName() != null && property.getName().equals(propertyName)) { return property.getValue(); } } @@ -257,7 +257,7 @@ public class DeviceTypePluginDAO { + getPreparedInputString(deviceDAODefinition.getColumnNames().size() + 1) + ")"; updateDBQueryForUpdateDevice = "UPDATE " + deviceDAODefinition.getDeviceTableName() + " SET " - + getDeviceTableColumnNamesForUpdateQuery()+ " WHERE " + deviceDAODefinition.getPrimaryKey() + + getDeviceTableColumnNamesForUpdateQuery() + " WHERE " + deviceDAODefinition.getPrimaryKey() + " = ?"; deleteDBQueryToRemoveDevicd = "DELETE FROM " + deviceDAODefinition.getDeviceTableName()