[ofbiz-framework] branch release18.12 updated: Fixed: Remove _PREVIOUS_REQUEST_ Session Attribute on non-authentication pages (OFBIZ-12047)

[jleroux]

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

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


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 71adde6  Fixed: Remove _PREVIOUS_REQUEST_ Session Attribute on 
non-authentication pages (OFBIZ-12047)
71adde6 is described below

commit 71adde61b54dfa162419add3ad41b0027dee57ca
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Mar 6 09:14:46 2022 +0100

    Fixed: Remove _PREVIOUS_REQUEST_ Session Attribute on non-authentication 
pages (OFBIZ-12047)
    
    Demo content website cmssite/cms could not be accessed because in this case
    requestUri is null. Like login request it does not need auth, I did not dig
    further, here is a simple fix.
---
 .../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 8490af0..1d9bef3 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -501,7 +501,7 @@ public class RequestHandler {
                     requestMap = 
ccfg.getRequestMapMap().getFirst("ajaxCheckLogin");
                 }
             }
-        } else {
+        } else if (requestUri != null) {
             String[] loginUris = 
EntityUtilProperties.getPropertyValue("security", "login.uris", 
delegator).split(",");
             boolean removePreviousRequest = true;
             for (int i = 0; i < loginUris.length; i++) {