Fixing administrativeStatus, validFrom and validTo mapping confusion.

Evolveum · Jul 15, 2014 · bbd03e3 · bbd03e3
1 parent 1a93713
commit bbd03e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
@@ -273,17 +273,17 @@ public <F extends FocusType> void processActivationUserCurrent(LensContext<F> co
         }
 
         if (capValidFrom != null) {
-	    	evaluateActivationMapping(context, accCtx, activationType.getAdministrativeStatus(),
+	    	evaluateActivationMapping(context, accCtx, activationType.getValidFrom(),
 	    			SchemaConstants.PATH_ACTIVATION_VALID_FROM, SchemaConstants.PATH_ACTIVATION_VALID_FROM, 
 	    			null, now, true, ActivationType.F_VALID_FROM.getLocalPart(), task, result);
         } else {
         	LOGGER.trace("Skipping activation validFrom processing because {} does not have activation validFrom capability", accCtx.getResource());
         }
 
         if (capValidTo != null) {
-	    	evaluateActivationMapping(context, accCtx, activationType.getAdministrativeStatus(),
+	    	evaluateActivationMapping(context, accCtx, activationType.getValidTo(),
 	    			SchemaConstants.PATH_ACTIVATION_VALID_TO, SchemaConstants.PATH_ACTIVATION_VALID_TO, 
-	    			null, now, true, ActivationType.F_VALID_FROM.getLocalPart(), task, result);
+	    			null, now, true, ActivationType.F_VALID_TO.getLocalPart(), task, result);
 	    } else {
 	    	LOGGER.trace("Skipping activation validTo processing because {} does not have activation validTo capability", accCtx.getResource());
 	    }