UNOMI-101 : Ignore profiles marked as "To Delete" if they do not exist
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3e6739fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3e6739fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3e6739fa Branch: refs/heads/master Commit: 3e6739faf37693c18147318a0bcf9015475e1917 Parents: 2d9a95a Author: Abdelkader Midani <amid...@apache.org> Authored: Thu Aug 10 01:23:05 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Thu Aug 10 01:23:05 2017 +0200 ---------------------------------------------------------------------- .../apache/unomi/router/services/ProfileImportServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3e6739fa/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java index e91ae7e..b7ab45a 100644 --- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java +++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java @@ -68,6 +68,10 @@ public class ProfileImportServiceImpl extends AbstractCustomServiceImpl implemen profileToImport.getMergingProperty(), profileToImport.getProperties().get(profileToImport.getMergingProperty()).toString()); } logger.debug("-------------------------------------"); - return persistenceService.save(existingProfile, true); + if (!profileToImport.isProfileToDelete()) { + return persistenceService.save(existingProfile, true); + } else { + return false; + } } }
