[unomi] branch master updated: UNOMI-281 Fix typo that was preventing merges from working properly.

[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 a30a4e4  UNOMI-281 Fix typo that was preventing merges from working 
properly.
a30a4e4 is described below

commit a30a4e484fbf7a1283d58c2abd66eee7f961d3b5
Author: Serge Huber <shu...@apache.org>
AuthorDate: Wed Mar 25 15:37:11 2020 +0100

    UNOMI-281 Fix typo that was preventing merges from working properly.
---
 .../unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8d3b54f..da92a24 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
@@ -182,7 +182,7 @@ public class MergeProfilesOnPropertyAction implements 
ActionExecutor {
                                     // be deleted upon next load
                                     profile.setMergedWith(masterProfileId);
                                     Map<String,Object> sourceMap = new 
HashMap<>();
-                                    sourceMap.put("mergedWith", masterProfile);
+                                    sourceMap.put("mergedWith", 
masterProfileId);
                                     profile.setSystemProperty("lastUpdated", 
new Date());
                                     sourceMap.put("systemProperties", 
profile.getSystemProperties());
                                     
persistenceService.update(profile.getItemId(), null, Profile.class, sourceMap);