Skip to content

Commit 1debaff

Browse files
committed
[SYNCOPE-1997] - Fix connectivity check
1 parent 4662a75 commit 1debaff

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

‎core/idm/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,17 +424,19 @@ public void check(final ResourceTO resourceTO) {
424424
ConnInstance connInstance = connInstanceDAO.findById(resourceTO.getConnector()).
425425
orElseThrow(() -> new NotFoundException("Connector " + resourceTO.getConnector()));
426426

427-
ExternalResource externalResource = Optional.ofNullable(resourceTO.getKey()).flatMap(resourceDAO::findById).
428-
orElseThrow(() -> new NotFoundException("Resource " + resourceTO.getKey()));
429-
430-
Optional<List<ConnConfProperty>> newConfOverride =
431-
ResourceDataBinder.newConf(externalResource.getConfOverride(), resourceTO.getConfOverride());
427+
Optional.ofNullable(resourceTO.getKey()).flatMap(resourceDAO::findById).
428+
ifPresent(externalResource -> {
429+
Optional<List<ConnConfProperty>> newConfOverride =
430+
ResourceDataBinder.newConf(externalResource.getConfOverride(),
431+
resourceTO.getConfOverride());
432+
resourceTO.setConfOverride(newConfOverride);
433+
});
432434

433435
connectorManager.createConnector(
434436
connectorManager.buildConnInstanceOverride(
435437
connInstance,
436-
newConfOverride,
437-
externalResource.getCapabilitiesOverride())).
438+
resourceTO.getConfOverride(),
439+
resourceTO.getCapabilitiesOverride())).
438440
test();
439441
}
440442

0 commit comments

Comments
 (0)