You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2024/08/28 07:24:22 UTC
(ofbiz-framework) branch release18.12 updated: Used ccfg.getRequestMapMap().getFirst(checkLogin).event to get the checklogin event.
This is an automated email from the ASF dual-hosted git repository.
deepak 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 d008c7814a Used ccfg.getRequestMapMap().getFirst(checkLogin).event to get the checklogin event.
d008c7814a is described below
commit d008c7814a95843afd85187cb1fa9e9e94f07065
Author: Deepak Dixit <de...@apache.org>
AuthorDate: Wed Aug 28 12:54:08 2024 +0530
Used ccfg.getRequestMapMap().getFirst(checkLogin).event to get the checklogin event.
---
.../org/apache/ofbiz/webapp/control/ConfigXMLReader.java | 15 +--------------
.../org/apache/ofbiz/webapp/control/RequestHandler.java | 4 ++--
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
index bff2048405..3360b64d5d 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
@@ -470,15 +470,6 @@ public class ConfigXMLReader {
public Map<String, RequestResponse> requestResponseMap = new HashMap<String, RequestResponse>();
public Metrics metrics = null;
- /**
- * Gets event.
- * @return the event
- */
- public Event getEvent() {
- return event;
- }
-
-
public RequestMap(Element requestMapElement) {
// Get the URI info
this.uri = requestMapElement.getAttribute("uri");
@@ -580,11 +571,7 @@ public class ConfigXMLReader {
public String strictTransportSecurity;
public String description;
public boolean noCache = false;
- private boolean securityAuth = false;
-
- public boolean isSecurityAuth() {
- return securityAuth;
- }
+ public boolean securityAuth = false;
public ViewMap(Element viewMapElement) {
this.name = viewMapElement.getAttribute("name");
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 1adafdd13b..d1aae320ce 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
@@ -1013,8 +1013,8 @@ public class RequestHandler {
}
// Perform security check.
- if (viewMap.isSecurityAuth() && UtilValidate.isEmpty(userLogin)) {
- ConfigXMLReader.Event checkLoginEvent = ccfg.getRequestMapMap().get("checkLogin").get(0).getEvent();
+ if (viewMap.securityAuth && UtilValidate.isEmpty(userLogin)) {
+ ConfigXMLReader.Event checkLoginEvent = ccfg.getRequestMapMap().getFirst("checkLogin").event;
String checkLoginReturnString = null;
try {