fix: Avoid NPE when displaying Page - Meeds-io/meeds#845 (#559)

Meeds-io · Mar 22, 2023 · 73201be · 73201be
1 parent 0c7959e
commit 73201be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UISiteBody.java b/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UISiteBody.java
@@ -65,7 +65,7 @@ public String getSiteClass() {
     }
 
     protected boolean isShowSiteBody(PortalRequestContext requestContext) {
-      return !requestContext.isShowMaxWindow() && !Util.getUIPage().isShowMaxWindow();
+      return !requestContext.isShowMaxWindow() && (Util.getUIPage() == null || !Util.getUIPage().isShowMaxWindow());
     }
 
     protected void processPageBodyRender(WebuiRequestContext context) throws Exception {

diff --git a/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISharedLayout.java b/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISharedLayout.java
@@ -43,7 +43,7 @@ public void processRender(WebuiRequestContext context) throws Exception {
   }
 
   protected boolean isShowSharedLayout(PortalRequestContext requestContext) {
-    return !requestContext.isHideSharedLayout() && !Util.getUIPage().isHideSharedLayout();
+    return !requestContext.isHideSharedLayout() && (Util.getUIPage() == null || !Util.getUIPage().isHideSharedLayout());
   }
 
   protected void processSiteBodyRender(WebuiRequestContext context) throws Exception {