[unomi] branch unomi-1.6.x 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 unomi-1.6.x
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/unomi-1.6.x by this push:
     new ed11051  UNOMI-548 : fix properties override (#379)
ed11051 is described below

commit ed11051cb6d417ea9ed645895b3961ad4cb8c29c
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 6648d9a..c64275f 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
@@ -358,6 +358,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());
 
@@ -409,8 +412,6 @@ public class ContextJsonEndpoint {
             }
         }
 
-        processOverrides(contextRequest, profile, session);
-
         if (!(profile instanceof Persona)) {
             
data.setTrackedConditions(rulesService.getTrackedConditions(contextRequest.getSource()));
         } else {