From 0119bac11331b6a77073bcc74ddaf85ac5a87b05 Mon Sep 17 00:00:00 2001 From: Hasini Samarathunga Date: Mon, 24 Nov 2025 14:08:27 +0530 Subject: [PATCH] Add null check for organizationId before rewriting basePath --- .../mgt/endpoint/util/IdentityManagementEndpointUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/src/main/java/org/wso2/carbon/identity/mgt/endpoint/util/IdentityManagementEndpointUtil.java b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/src/main/java/org/wso2/carbon/identity/mgt/endpoint/util/IdentityManagementEndpointUtil.java index 8bea960fe246..a05e70598014 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/src/main/java/org/wso2/carbon/identity/mgt/endpoint/util/IdentityManagementEndpointUtil.java +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/src/main/java/org/wso2/carbon/identity/mgt/endpoint/util/IdentityManagementEndpointUtil.java @@ -856,9 +856,11 @@ public static String getBasePath(String tenantDomain, String context, boolean is } else if (basePath != null && basePath.contains(FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX)) { String organizationId = PrivilegedCarbonContext.getThreadLocalCarbonContext() .getOrganizationId(); - basePath = basePath.replace( - FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX + organizationId, - FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain); + if (organizationId != null) { + basePath = basePath.replace( + FrameworkConstants.ORGANIZATION_CONTEXT_PREFIX + organizationId, + FrameworkConstants.TENANT_CONTEXT_PREFIX + tenantDomain); + } } } else { serverUrl = ServiceURLBuilder.create().build().getAbsoluteInternalURL();