Possible fix for "channel: null" in account notifications during reco…

…nciliation.
Evolveum · Jun 9, 2016 · b70b793 · b70b793
1 parent e849553
commit b70b793
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -144,15 +144,14 @@ public final class WebComponentUtil {
 	private static final Trace LOGGER = TraceManager.getTrace(WebComponentUtil.class);
 	private static DatatypeFactory df = null;
 
-	public static enum Channel {
+	public enum Channel {
 		// TODO: move this to schema component
-		LIVE_SYNC(
-				"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#liveSync"), RECONCILIATION(
-						"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#reconciliation"), DISCOVERY(
-								"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#discovery"), IMPORT(
-										"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#import"), USER(
-												"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#user"), WEB_SERVICE(
-														"http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#webService");
+		LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),
+		RECONCILIATION(SchemaConstants.CHANGE_CHANNEL_RECON_URI),
+		DISCOVERY(SchemaConstants.CHANGE_CHANNEL_DISCOVERY_URI),
+		IMPORT(SchemaConstants.CHANNEL_OBJECT_IMPORT_URI),
+		USER(SchemaConstants.CHANNEL_GUI_USER_URI),
+		WEB_SERVICE(SchemaConstants.CHANNEL_WEB_SERVICE_URI);
 
 		private String channel;
 

diff --git a/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java b/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java
@@ -180,9 +180,11 @@ private ResourceObjectEvent createRequest(OperationStatus status,
             LOGGER.warn("No owner for task " + task + ", therefore no requester will be set for event " + event.getId());
         }
 
-        if (task != null) {
+        if (task != null && task.getChannel() != null) {
             event.setChannel(task.getChannel());
-        }
+        } else if (operationDescription.getSourceChannel() != null) {
+			event.setChannel(operationDescription.getSourceChannel());
+		}
 
         return event;
     }