MID-2878

Evolveum · May 25, 2016 · e80887a · e80887a
1 parent a8d0da1
commit e80887a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...s-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java b/...s-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
@@ -137,8 +137,12 @@ private Event createRequest(PrismObject<? extends ObjectType> object, Task task,
 
         ModelEvent event = new ModelEvent(lightweightIdentifierGenerator);
         event.setModelContext(modelContext);
-        // TODO or take channel from modelContext?
-        event.setChannel(task.getChannel());
+		// TODO is this correct? it's not quite clear how we work with channel info in task / modelContext
+		String channel = task.getChannel();
+		if (channel == null) {
+			channel = modelContext.getChannel();
+		}
+        event.setChannel(channel);
 
         if (task.getOwner() != null) {
             event.setRequester(new SimpleObjectRefImpl(notificationsUtil, task.getOwner().asObjectable()));