(ofbiz-framework) branch trunk updated: Fixed: Escape null pointer if session is empty when resolve the theme

[nmalin]

This is an automated email from the ASF dual-hosted git repository.

nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 248dc73aac Fixed: Escape null pointer if session is empty when resolve 
the theme
248dc73aac is described below

commit 248dc73aacbe83c7921469763c46aca5dca2a399
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Thu Nov 21 18:03:25 2024 +0100

    Fixed: Escape null pointer if session is empty when resolve the theme
    
    On specific case, if the session is empty (like request mocked) the theming 
failed with a NPE.
    
    So just escape it
---
 .../src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
index abfd305737..1891350467 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
@@ -236,7 +236,9 @@ public final class ThemeFactory {
         String visualThemeId = null;
         if (request != null) {
             HttpSession session = request.getSession();
-            GenericValue userLogin = (GenericValue) 
session.getAttribute("userLogin");
+            GenericValue userLogin = session != null
+                    ? (GenericValue) session.getAttribute("userLogin")
+                    : null;
             //search on request only if a userLogin is present on session 
(otherwise this implied that the user isn't identify so wait
             if (userLogin != null) {
                 VisualTheme visualTheme = (VisualTheme) 
session.getAttribute("visualTheme");
@@ -258,7 +260,7 @@ public final class ThemeFactory {
             }
 
             //resolve from webapp
-            if (visualThemeId == null) {
+            if (visualThemeId == null && session != null) {
                 ServletContext servletContext = request.getServletContext();
                 visualThemeId = 
servletContext.getInitParameter("visualThemeId");
             }