You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2018/06/05 13:57:19 UTC
svn commit: r1832945 - in /ofbiz/ofbiz-framework/branches/release17.12: ./
framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Author: jleroux
Date: Tue Jun 5 13:57:18 2018
New Revision: 1832945
URL: http://svn.apache.org/viewvc?rev=1832945&view=rev
Log:
"Applied fix from trunk for revision: 1832944 "
------------------------------------------------------------------------
r1832944 | jleroux | 2018-06-05 15:56:29 +0200 (mar. 05 juin 2018) | 17 lignes
Fixed: The first visit event are not executed in case of CMS
(OFBIZ-10389)
Execution of the first visit events depends on the trackVisit function
In RequestHandler.java file
if (this.trackVisit(request) && session.getAttribute("_FIRST_VISIT_EVENTS_") == null) {
// execute first visit event
}
trackVisit function does not honor the default controller request
(in this case, cms) So, we should improve the code of trackVisit to honor
default controller request.
Thanks: Swapnil M Mane
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 5 13:57:18 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944
Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1832945&r1=1832944&r2=1832945&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java Tue Jun 5 13:57:18 2018
@@ -1241,10 +1241,15 @@ public class RequestHandler {
ConfigXMLReader.RequestMap requestMap = null;
try {
requestMap = getControllerConfig().getRequestMapMap().get(uriString);
+ if (requestMap == null) {
+ requestMap = getControllerConfig().getRequestMapMap().get(getControllerConfig().getDefaultRequest());
+ if (requestMap == null) {
+ return false;
+ }
+ }
} catch (WebAppConfigurationException e) {
Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
}
- if (requestMap == null) return false;
return requestMap.trackServerHit;
} else {
return false;
@@ -1260,10 +1265,15 @@ public class RequestHandler {
ConfigXMLReader.RequestMap requestMap = null;
try {
requestMap = getControllerConfig().getRequestMapMap().get(uriString);
+ if (requestMap == null) {
+ requestMap = getControllerConfig().getRequestMapMap().get(getControllerConfig().getDefaultRequest());
+ if (requestMap == null) {
+ return false;
+ }
+ }
} catch (WebAppConfigurationException e) {
Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
}
- if (requestMap == null) return false;
return requestMap.trackVisit;
} else {
return false;