Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Sep 28, 2016
2 parents 0e943ec + 0b3128c commit ce7b967
Showing 1 changed file with 2 additions and 1 deletion.
Expand Up @@ -257,9 +257,10 @@ public <O extends ObjectType> PrismObjectDefinition<O> getEditObjectDefinition(P
PrismObject<ShadowType> shadow = (PrismObject<ShadowType>)object;
String resourceOid = ShadowUtil.getResourceOid(shadow);
if (resourceOid != null) {
Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(GetOperationOptions.createReadOnly());
PrismObject<ResourceType> resource;
try {
resource = provisioning.getObject(ResourceType.class, resourceOid, null, null, result); // TODO include task here
resource = provisioning.getObject(ResourceType.class, resourceOid, options, null, result); // TODO include task here
} catch (CommunicationException | SecurityViolationException e) {
throw new ConfigurationException(e.getMessage(), e);
}
Expand Down

0 comments on commit ce7b967

Please sign in to comment.