Merge remote-tracking branch 'origin/master'

Evolveum · Sep 17, 2018 · 3d2c15c · 3d2c15c
2 parents de9305e + ca2eadf
commit 3d2c15c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java b/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
@@ -1864,6 +1864,12 @@ public SearchResultMetadata searchObjectsIterative(final ProvisioningContext ctx
 
 						resultShadow = completeShadow(shadowCtx, resourceShadow, repoShadow, isDoDiscovery, objResult);
 
+						//check and fix kind/intent
+						ShadowType repoShadowType = repoShadow.asObjectable();
+						if (repoShadowType.getKind() == null || repoShadowType.getIntent() == null) { //TODO: check also empty?
+							fixKindIntentForShadow(repoShadow, ctx.getResource().asPrismObject(), false);
+						}
+
 					} else {
 						resultShadow = resourceShadow;
 					}
@@ -2106,12 +2112,6 @@ private PrismObject<ShadowType> lookupOrCreateLiveShadowInRepository(Provisionin
 
 			repoShadow = createShadowInRepository(ctx, resourceShadow, unknownIntent, isDoDiscovery, parentResult);
 		} else {
-			//check and fix kind/intent
-			ShadowType repoShadowType = repoShadow.asObjectable();
-			if (repoShadowType.getKind() == null || repoShadowType.getIntent() == null) { //TODO: check also empty?
-				fixKindIntentForShadow(repoShadow, ctx.getResource().asPrismObject(), false);
-			}
-
 			if (LOGGER.isTraceEnabled()) {
 				LOGGER.trace("Found shadow object in the repository {}", ShadowUtil.shortDumpShadow(repoShadow));
 			}