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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java

@@ -30,6 +30,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.RoleManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.FilteringUtil;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.util.SetReferenceTransformer;
 import org.wso2.carbon.registry.api.Registry;
@@ -68,6 +69,9 @@ public class RoleManagementServiceImpl implements RoleManagementService {
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @QueryParam("offset") int offset, @QueryParam("limit") int limit) {
         RequestValidationUtil.validatePaginationParameters(offset, limit);
+        if (limit == 0){
+            limit = Constants.DEFAULT_PAGE_LIMIT;
+        }
         List<String> filteredRoles;
         RoleList targetRoles = new RoleList();
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -363,7 +363,9 @@ public class UserManagementServiceImpl implements UserManagementService {
         }
 
         RequestValidationUtil.validatePaginationParameters(offset, limit);
-
+        if (limit == 0){
+            limit = Constants.DEFAULT_PAGE_LIMIT;
+        }
         List<BasicUserInfo> userList, offsetList;
         String appliedFilter = ((filter == null) || filter.isEmpty() ? "*" : filter + "*");
         // to get whole set of users, appliedLimit is set to -1

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

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

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -350,7 +350,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         if (deviceStatusTaskPluginConfig != null && deviceStatusTaskPluginConfig.isRequireStatusMonitoring()) {
             try {
                 DeviceManagementDataHolder.getInstance().removeDeviceStatusTaskPluginConfig(deviceType);
-                deviceStatusTaskManagerService.stopTask(deviceType, deviceStatusTaskPluginConfig);
+                if (deviceStatusTaskManagerService != null) {
+                    deviceStatusTaskManagerService.stopTask(deviceType, deviceStatusTaskPluginConfig);
+                }
             } catch (DeviceStatusTaskException e) {
                 throw new DeviceManagementException("Error occurred while stopping Device Status task service for '" +
                         deviceManagementService.getType() + "'", e);

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

@@ -2333,8 +2333,14 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             DeviceManagementDAOFactory.openConnection();
             info = deviceInfoDAO.getDeviceInformation(device.getId());
             DeviceLocation location = deviceInfoDAO.getDeviceLocation(device.getId());
-            if (info != null) {
+            if (location != null) {
-                info.setLocation(location);
+                //There are some cases where the device-info is not updated properly. Hence returning a null value.
+                if (info != null) {
+                    info.setLocation(location);
+                } else {
+                    info = new DeviceInfo();
+                    info.setLocation(location);
+                }
             }
         } catch (DeviceDetailsMgtDAOException e) {
             String msg = "Error occurred while retrieving advance info of '" + device.getType() +