(ofbiz-framework) branch trunk updated: Fixed overrideViewUri condition in RequestHandler.resolveURI() method (OFBIZ-13117)

[deepak]

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

deepak 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 c8cc30b3bb Fixed overrideViewUri condition in 
RequestHandler.resolveURI() method (OFBIZ-13117)
c8cc30b3bb is described below

commit c8cc30b3bb6548be226622d9f6ee5fd0f8c4f79f
Author: Deepak Dixit <dee...@apache.org>
AuthorDate: Sat Jun 15 11:28:59 2024 +0530

    Fixed overrideViewUri condition in RequestHandler.resolveURI() method 
(OFBIZ-13117)
---
 .../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 e3cb6ce8bc..354a9da65b 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
@@ -140,7 +140,7 @@ public final class RequestHandler {
                 allowDirectViewRendering = (overrideViewMap != null && 
overrideViewMap.isAllowDirectViewRendering());
             }
             if (requestMapMap.containsKey(requestUri)
-                    && (allowDirectViewRendering
+                    && (overrideViewUri == null || allowDirectViewRendering
                     || ("SOAPService".equals(requestUri) && 
"wsdl".equalsIgnoreCase(req.getQueryString())))) {
                 rmaps = requestMapMap.get(requestUri);
                 req.setAttribute("overriddenView", overrideViewUri);