[unomi] branch master updated: UNOMI-548 : fix properties override (#379)

[dgriffon]

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

dgriffon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new 447f4af  UNOMI-548 : fix properties override (#379)
447f4af is described below

commit 447f4afec9a1ab803793abc7ae5b2eec721c7a74
Author: David Griffon <dgrif...@jahia.com>
AuthorDate: Tue Jan 25 16:55:34 2022 +0100

    UNOMI-548 : fix properties override (#379)
---
 .../java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java 
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
index c541987..7748b9a 100644
--- 
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
+++ 
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
@@ -369,6 +369,9 @@ public class ContextJsonEndpoint {
 
     private Changes handleRequest(ContextRequest contextRequest, Session 
session, Profile profile, ContextResponse data,
             ServletRequest request, ServletResponse response, Date timestamp) {
+
+        processOverrides(contextRequest, profile, session);
+
         Changes changes = 
restServiceUtils.handleEvents(contextRequest.getEvents(), session, profile, 
request, response, timestamp);
         data.setProcessedEvents(changes.getProcessedItems());
 
@@ -420,8 +423,6 @@ public class ContextJsonEndpoint {
             }
         }
 
-        processOverrides(contextRequest, profile, session);
-
         if (!(profile instanceof Persona)) {
             
data.setTrackedConditions(rulesService.getTrackedConditions(contextRequest.getSource()));
         } else {