Fix unit test failures

wso2 · Sep 6, 2024 · 7fc7f46 · 7fc7f46
1 parent bb6e6f4
commit 7fc7f46
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/....carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java b/....carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java
@@ -1436,13 +1436,15 @@ private String updateSwaggerSecurityDefinitionForStore(Swagger swagger, SwaggerD
 
  KeyManagerConfigurationDTO keyManagerConfigurationDTO = null;
  try {
- String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
- APIAdmin apiAdmin = new APIAdminImpl();
- keyManagerConfigurationDTO = apiAdmin.getKeyManagerConfigurationById(tenantDomain, kmId);
- if (keyManagerConfigurationDTO == null || (StringUtils.isEmpty(kmId) && !Objects.equals(
- keyManagerConfigurationDTO.getType(), APIConstants.KeyManager.DEFAULT_KEY_MANAGER_TYPE))) {
- keyManagerConfigurationDTO = apiAdmin.getKeyManagerConfigurationByName(tenantDomain,
- APIConstants.KeyManager.DEFAULT_KEY_MANAGER);
+ if (!StringUtils.isEmpty(kmId)) {
+ String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+ APIAdmin apiAdmin = new APIAdminImpl();
+ keyManagerConfigurationDTO = apiAdmin.getKeyManagerConfigurationById(tenantDomain, kmId);
+ if (keyManagerConfigurationDTO == null || (StringUtils.isEmpty(kmId) && !Objects.equals(
+ keyManagerConfigurationDTO.getType(), APIConstants.KeyManager.DEFAULT_KEY_MANAGER_TYPE))) {
+ keyManagerConfigurationDTO = apiAdmin.getKeyManagerConfigurationByName(tenantDomain,
+ APIConstants.KeyManager.DEFAULT_KEY_MANAGER);
+ }
  }
  } catch (APIManagementException e) {
  if (!StringUtils.isEmpty(kmId)) {