You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2020/01/16 13:23:53 UTC
[unomi] branch master updated: Handled Enum while merging profiles
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 23562e4 Handled Enum while merging profiles
new 13fd3df Merge pull request #124 from akvishnuta/feature/UNOMI_261
23562e4 is described below
commit 23562e4da80df2c5f43032bbcb5ad8828ea5868f
Author: Akhil <ak...@pearldatadirect.com>
AuthorDate: Thu Jan 16 10:33:52 2020 +0530
Handled Enum while merging profiles
Fixed UNOMI_261 - Unable to update consent status through cxs/profiles endpoint
---
.../org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
index 02f2526..f1a28dd 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
@@ -1023,7 +1023,10 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
target.put(newEntry.getKey(), newEntry.getValue());
changed = true;
}
- } else {
+ } else if(newEntry.getValue().getClass().isEnum()) {
+ target.put(newEntry.getKey(), newEntry.getValue());
+ changed = true;
+ }else {
if (target.get(newEntry.getKey()) != null) {
changed |= merge(target.get(newEntry.getKey()), newEntry.getValue());
} else {