From 5c680b3f655b5419b62208d2fe60b7cb2ebba137 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 4 May 2016 04:13:39 +0530
Subject: [PATCH] Fixing issue on group permission validating

---
 .../DeviceAccessAuthorizationServiceImpl.java            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java
index d3d3ed09c0..4707bcdd4c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java
@@ -38,6 +38,7 @@ import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -186,8 +187,12 @@ public class DeviceAccessAuthorizationServiceImpl implements DeviceAccessAuthori
                 DeviceManagementDataHolder.getInstance().getGroupManagementProviderService()
                         .getGroups(deviceIdentifier);
         for (DeviceGroup group : authorizedGroups) {
-            if (groupsWithDevice.contains(group)) {
-                return true;
+            Iterator<DeviceGroup> groupsWithDeviceIterator = groupsWithDevice.iterator();
+            while (groupsWithDeviceIterator.hasNext()) {
+                DeviceGroup deviceGroup = groupsWithDeviceIterator.next();
+                if (deviceGroup.getId() == group.getId()) {
+                    return true;
+                }
             }
         }
         return false;