[ranger] 03/03: RANGER-4127: Unable to delete the user if policy is created by same user and added in the policy item

[pradeep]

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 85cf0c2da119af379bc1f818ab6a47c2315a14a9
Author: Pradeep AgrawaL <prad...@apache.org>
AuthorDate: Thu Mar 9 14:35:17 2023 +0530

    RANGER-4127: Unable to delete the user if policy is created by same user 
and added in the policy item
---
 security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java 
b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
index 49a74cd1e..b3aca3164 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
@@ -2256,7 +2256,6 @@ public class XUserMgr extends XUserMgrBase {
                List<XXPortalUserRole> 
xXPortalUserRoles=xXPortalUserRoleDao.findByUserId(xXPortalUserId);
 
                XXPolicyDao xXPolicyDao = daoManager.getXXPolicy();
-               List<XXPolicy> xXPolicyList=xXPolicyDao.findByUserId(id);
                logger.warn("Deleting User : "+vXUser.getName());
                if (force) {
                        //delete XXGroupUser mapping
@@ -2308,6 +2307,7 @@ public class XUserMgr extends XUserMgrBase {
                                }
                        }
                        //delete XXPolicyItemUserPerm records of user
+                       List<XXPolicy> 
xXPolicyList=xXPolicyDao.findByUserId(id);
                        for(XXPolicy xXPolicy:xXPolicyList){
                                RangerPolicy rangerPolicy = 
policyService.getPopulatedViewObject(xXPolicy);
                                List<RangerPolicyItem> policyItems = 
rangerPolicy.getPolicyItems();
@@ -2357,7 +2357,7 @@ public class XUserMgr extends XUserMgrBase {
                        }
                } else {
                        boolean hasReferences=false;
-
+                       List<XXPolicy> 
xXPolicyList=xXPolicyDao.findByUserId(id);
                        if(vxGroupUserList!=null && 
vxGroupUserList.getListSize()>0){
                                hasReferences=true;
                        }