Merge pull request #7066 from DonOmalVindula/fix/null-check-order

Implement possible fix jsp rendering error
wso2 · Oct 30, 2024 · 6f1ed91 · 6f1ed91
2 parents 0034e20 + cc737fc
commit 6f1ed91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/hungry-sheep-sip.md b/.changeset/hungry-sheep-sip.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Implement possible fix jsp rendering error
diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/password-reset-complete.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/password-reset-complete.jsp
@@ -129,7 +129,7 @@
     Boolean appEnabledStatus = false;
 
     // Temporary fix for application name not retrieving from the applicationDataRetrievalClient.
-    if (applicationName.equals("null") || StringUtils.isBlank(applicationName)) {
+    if (StringUtils.isBlank(applicationName) || applicationName.equals("null")) {
         // If application name is not available, fallback to My Account application.
         appEnabledStatus = applicationDataRetrieval.getApplicationEnabledStatus(tenantDomain, MY_ACCOUNT_APP_NAME);
     } else {