Repository: incubator-unomi Updated Branches: refs/heads/master 510ae898b -> 6eb486ea8
UNOMI-29 : always use current profile Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/6eb486ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/6eb486ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/6eb486ea Branch: refs/heads/master Commit: 6eb486ea867a5a185da65657ad8ab95420cf9a6c Parents: 510ae89 Author: Thomas Draier <dra...@apache.org> Authored: Wed Apr 27 14:45:28 2016 +0200 Committer: Thomas Draier <dra...@apache.org> Committed: Wed Apr 27 14:45:28 2016 +0200 ---------------------------------------------------------------------- .../org/apache/unomi/services/services/EventServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6eb486ea/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java index 22cdcda..5d26773 100644 --- a/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java +++ b/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java @@ -130,13 +130,12 @@ public class EventServiceImpl implements EventService { int changes = NO_CHANGE; - Profile profile = event.getProfile(); final Session session = event.getSession(); if (event.isPersistent() && session != null) { session.setLastEventDate(event.getTimeStamp()); } - if (profile != null) { + if (event.getProfile() != null) { for (EventListenerService eventListenerService : eventListeners) { if (eventListenerService.canHandle(event)) { changes |= eventListenerService.onEvent(event); @@ -148,13 +147,13 @@ public class EventServiceImpl implements EventService { } if ((changes & PROFILE_UPDATED) == PROFILE_UPDATED) { - Event profileUpdated = new Event("profileUpdated", session, profile, event.getScope(), event.getSource(), profile, event.getTimeStamp()); + Event profileUpdated = new Event("profileUpdated", session, event.getProfile(), event.getScope(), event.getSource(), event.getProfile(), event.getTimeStamp()); profileUpdated.setPersistent(false); profileUpdated.getAttributes().putAll(event.getAttributes()); changes |= send(profileUpdated); if (session != null) { changes |= SESSION_UPDATED; - session.setProfile(profile); + session.setProfile(event.getProfile()); } } }