From 2c27830eccac3306e5a357a6a6e05a7b309b263a Mon Sep 17 00:00:00 2001
From: ausamriyaaz <ausamriyaaz@gmail.com>
Date: Fri, 27 Sep 2019 15:42:01 +0530
Subject: [PATCH] Fix Null pointer exception

---
 .../impl/admin/GroupManagementAdminServiceImpl.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
index 5c0537d2d3..f1783cb619 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
@@ -40,8 +40,12 @@ public class GroupManagementAdminServiceImpl implements GroupManagementAdminServ
         try {
             RequestValidationUtil.validatePaginationParameters(offset, limit);
             GroupPaginationRequest request = new GroupPaginationRequest(offset, limit);
-            request.setGroupName(name.toUpperCase());
-            request.setOwner(owner.toUpperCase());
+            if (name != null){
+                request.setGroupName(name.toUpperCase());
+            }
+            if (owner != null) {
+                request.setOwner(owner.toUpperCase());
+            }
             PaginationResult deviceGroupsResult = DeviceMgtAPIUtils.getGroupManagementProviderService()
                     .getGroups(request);
             DeviceGroupList deviceGroupList = new DeviceGroupList();