Merge pull request #12074 from GihanAyesh/master

Get all policies from CP before undeploying
wso2 · Jul 6, 2023 · 59f84fe · 59f84fe
2 parents 5af7105 + 7ec68cd
commit 59f84fe
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...loyer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/utils/PolicyUtil.java b/...loyer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/utils/PolicyUtil.java
@@ -152,15 +152,18 @@ public static void deployPolicy(Policy policy, PolicyEvent policyEvent) {
      * Deploy all the throttle policies retrieved from the database in the Traffic Manager.
      */
     public static void deployAllPolicies() {
-        // Undeploy all existing policies
-        undeployAllPolicies();
         PolicyRetriever policyRetriever = new PolicyRetriever();
         try {
             // Deploy all the policies retrieved from the database
             SubscriptionPolicyList subscriptionPolicies = new SubscriptionPolicyList();
             if (migrationEnabled == null) {
                 subscriptionPolicies = policyRetriever.getAllSubscriptionPolicies();
             }
+            ApplicationPolicyList applicationPolicies = policyRetriever.getAllApplicationPolicies();
+            ApiPolicyList apiPolicies = policyRetriever.getAllApiPolicies();
+            GlobalPolicyList globalPolicies = policyRetriever.getAllGlobalPolicies();
+            // Undeploy all existing policies
+            undeployAllPolicies();
             for (SubscriptionPolicy subscriptionPolicy : subscriptionPolicies.getList()) {
                 if (!(APIConstants.UNLIMITED_TIER.equalsIgnoreCase(subscriptionPolicy.getName())
                         || APIConstants.DEFAULT_SUB_POLICY_ASYNC_UNLIMITED.
@@ -170,19 +173,16 @@ public static void deployAllPolicies() {
                     deployPolicy(subscriptionPolicy, null);
                 }
             }
-            ApplicationPolicyList applicationPolicies = policyRetriever.getAllApplicationPolicies();
             for (ApplicationPolicy applicationPolicy : applicationPolicies.getList()) {
                 if (!APIConstants.UNLIMITED_TIER.equalsIgnoreCase(applicationPolicy.getName())) {
                     deployPolicy(applicationPolicy, null);
                 }
             }
-            ApiPolicyList apiPolicies = policyRetriever.getAllApiPolicies();
             for (ApiPolicy apiPolicy : apiPolicies.getList()) {
                 if (!APIConstants.UNLIMITED_TIER.equalsIgnoreCase(apiPolicy.getName())) {
                     deployPolicy(apiPolicy, null);
                 }
             }
-            GlobalPolicyList globalPolicies = policyRetriever.getAllGlobalPolicies();
             for (GlobalPolicy globalPolicy : globalPolicies.getList()) {
                 deployPolicy(globalPolicy, null);
             }