From 2d875da32aa142151c976aea925a6cc9bd4e20dd Mon Sep 17 00:00:00 2001
From: Abhay Kulkarni <akulkarni@cloudera.com>
Date: Thu, 4 Apr 2024 09:31:16 -0700
Subject: [PATCH] RANGER-4767: Deleted policies are still taking effect if all
 policies for a security zone are deleted

---
 .../org/apache/ranger/plugin/service/RangerBasePlugin.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
index 6a3d59dae8..97da473a85 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
@@ -383,6 +383,13 @@ public void setPolicies(ServicePolicies policies) {
 						if (policies.getPolicies() == null) {
 							policies.setPolicies(new ArrayList<>());
 						}
+						if (MapUtils.isNotEmpty(policies.getSecurityZones())) {
+							for (ServicePolicies.SecurityZoneInfo element : policies.getSecurityZones().values()) {
+								if (element.getPolicies() == null) {
+									element.setPolicies(new ArrayList<>());
+								}
+							}
+						}
 					}
 				}
 			}