Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -76,8 +76,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext()
                 .getTenantDomain();
         String tiersLoadedForTenant = tiersMap.get(tenantDomain);
+
         if (tiersLoadedForTenant == null) {
-            int tierStatus = 0;
+            boolean tierLoaded = false;
             int attempts = 0;
             do {
                 try {
@@ -85,9 +86,8 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                             .tiersTierLevelTierNameGet(ApiApplicationConstants.DEFAULT_TIER, APP_TIER_TYPE,
                                     tenantDomain, CONTENT_TYPE, null, null);
                     tiersMap.put(tenantDomain, "exist");
-                    tierStatus = 200;
+                    tierLoaded = true;
                 } catch (FeignException e) {
-                    tierStatus = e.status();
                     attempts++;
                     try {
                         Thread.sleep(500);
@@ -95,7 +95,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                         log.warn("Interrupted the waiting for tier availability.");
                     }
                 }
-            } while (tierStatus == 500 && attempts < MAX_ATTEMPTS);
+            } while ((!tierLoaded) && attempts < MAX_ATTEMPTS);
         }
 
         ApplicationList applicationList = storeClient.getApplications()