Fixing connector operation status for multi-connector resources

Evolveum · Apr 28, 2017 · 076a0a6 · 076a0a6
1 parent b45b677
commit 076a0a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...visioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java b/...visioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
@@ -1108,8 +1108,10 @@ public List<ConnectorOperationalStatus> getConnectorOperationalStatus(PrismObjec
 		for (ConnectorSpec connectorSpec: getAllConnectorSpecs(resource)) {
 			ConnectorInstance connectorInstance = connectorManager.getConfiguredConnectorInstance(connectorSpec, false, result);
 			ConnectorOperationalStatus operationalStatus = connectorInstance.getOperationalStatus();
-			operationalStatus.setConnectorName(connectorSpec.getConnectorName());
-			statuses.add(operationalStatus);
+			if (operationalStatus != null) {
+				operationalStatus.setConnectorName(connectorSpec.getConnectorName());
+				statuses.add(operationalStatus);
+			}
 		}
 		return statuses;
 	}

diff --git a/...om/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java b/...om/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
@@ -263,8 +263,9 @@ public int count(ObjectClassComplexTypeDefinition objectClassDefinition, ObjectQ
 
 	@Override
 	public ConnectorOperationalStatus getOperationalStatus() throws ObjectNotFoundException {
-		// operational status is not supported
-		return null;
+		ConnectorOperationalStatus opstatus = new ConnectorOperationalStatus();
+		opstatus.setConnectorClassName(this.getClass().getName());
+		return opstatus;
 	}
 
 	@Override