community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing https://github.com/wso2/product-iots/issues/1374.

Browse Source
This commit is contained in:
sinthuja 2017-09-01 13:02:13 +05:30
parent c308147357
commit c53e027701
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java
View File

@ -30,7 +30,7 @@ public class Constants {
public static final String DEFAULT_STREAM_VERSION = "1.0.0"; public static final String DEFAULT_STREAM_VERSION = "1.0.0";
public static final String SCOPE = "scope"; public static final String SCOPE = "scope";
public static final String JDBC_USERSTOREMANAGER = "org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager"; public static final String JDBC_USERSTOREMANAGER = "org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager";
public static final int DEFAULT_PAGE_LIMIT = 10; public static final int DEFAULT_PAGE_LIMIT = 50;
public final class ErrorMessages { public final class ErrorMessages {

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
View File

@ -1720,15 +1720,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Get devices by name " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo); log.debug("Get devices by name " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo);
} }
List<Device> devices = new ArrayList<>();
List<Device> allDevices; List<Device> allDevices;
int limit = DeviceManagerUtil.validateDeviceListPageSize(request.getRowCount()); int limit = DeviceManagerUtil.validateDeviceListPageSize(request.getRowCount());
try { try {
DeviceManagementDAOFactory.openConnection(); DeviceManagementDAOFactory.openConnection();
allDevices = deviceDAO.getDevicesByNameAndType(request.getDeviceName(), request.getDeviceType(), allDevices = deviceDAO.getDevicesByNameAndType(request.getDeviceName(), request.getDeviceType(),
this.getTenantId(), request.getStartIndex(), limit); this.getTenantId(), request.getStartIndex(), limit);
List<Device> filterd = null;
filterd.get(0);
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
String msg = "Error occurred while fetching the list of devices that matches to '" String msg = "Error occurred while fetching the list of devices that matches to '"
+ request.getDeviceName() + "'"; + request.getDeviceName() + "'";