Fix the code after recent changes

(and adapt failing test)
Evolveum · Mar 13, 2019 · 8e69471 · 8e69471
1 parent b2ff7f1
commit 8e69471
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
@@ -724,6 +724,7 @@ private <F extends FocusType> void reactToChange(SynchronizationContext<F> syncC
 		if (syncCtx.getReaction() == null) {
 			LOGGER.trace("No reaction is defined for situation {} in {}", syncCtx.getSituation(), syncCtx.getResource());
 			eventInfo.setNewSituation(newSituation);
+			return;
 		}
 
 		Boolean doReconciliation = syncCtx.isDoReconciliation();

diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
@@ -109,7 +109,7 @@ public void test010ListConnectors() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess("getObject result", result);
 
-        assertEquals("Unexpected number of connectors", 10, connectors.size());
+        assertEquals("Unexpected number of connectors", 11, connectors.size());
         for(PrismObject<ConnectorType> connector: connectors) {
         	display("Connector", connector);
         	ConnectorType connectorType = connector.asObjectable();

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
@@ -2688,8 +2688,8 @@ private void preProcessChange(ProvisioningContext ctx, Change change, OperationR
 
 		if (change.getOldShadow() == null) {
 			PrismObject<ShadowType> repoShadow = shadowManager.findOrAddShadowFromChange(ctx, change, parentResult);
-			shadowCaretaker.applyAttributesDefinition(ctx, repoShadow);
 			if (repoShadow != null) {
+				shadowCaretaker.applyAttributesDefinition(ctx, repoShadow);
 				change.setOldShadow(repoShadow);
 			} else {
 				assert change.isDelete();