[unomi] branch master updated: Fix typo in merge action

[shuber]

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

shuber 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 46a2c2c  Fix typo in merge action
46a2c2c is described below

commit 46a2c2c901c4a8aa804e760987895edcb3c0eb08
Author: Serge Huber <shu...@apache.org>
AuthorDate: Tue Nov 26 19:54:15 2019 +0100

    Fix typo in merge action
    
    Signed-off-by: Serge Huber <shu...@apache.org>
---
 .../plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
index c1e89f4..2f4d0cf 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
@@ -75,12 +75,12 @@ public class MergeProfilesOnPropertyAction implements 
ActionExecutor {
         // store the profile id in case the merge change it to a previous one
         String profileId = profile.getItemId();
 
-        Condition propertyCondition = new 
Condition(definitionsService.getConditionType("eventPropertyCondition"));
+        Condition propertyCondition = new 
Condition(definitionsService.getConditionType("profilePropertyCondition"));
         propertyCondition.setParameter("comparisonOperator", "equals");
         propertyCondition.setParameter("propertyName", "systemProperties." + 
mergeProfilePropertyName);
         propertyCondition.setParameter("propertyValue", 
mergeProfilePropertyValue);
 
-        Condition excludeMergedProfilesCondition = new 
Condition(definitionsService.getConditionType("eventPropertyCondition"));
+        Condition excludeMergedProfilesCondition = new 
Condition(definitionsService.getConditionType("profilePropertyCondition"));
         excludeMergedProfilesCondition.setParameter("comparisonOperator", 
"missing");
         excludeMergedProfilesCondition.setParameter("propertyName", 
"mergedWith");