Small logging fixes (projector, task status DTO).

Evolveum · Sep 23, 2015 · cc4b5bb · cc4b5bb
1 parent 3ecd06a
commit cc4b5bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/...va/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.java b/...va/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.java
@@ -77,7 +77,7 @@ protected TaskCurrentStateDto getObjectInternal() {
         }
 
         if (taskId == null) {
-            LOGGER.warn("taskIdentifier not available");
+            LOGGER.trace("taskIdentifier not available");
             return new TaskCurrentStateDto(taskModel.getObject());
         }
         MidPointApplication application = (MidPointApplication) Application.get();
@@ -119,13 +119,13 @@ protected TaskCurrentStateDto getObjectInternal() {
         if (sit != null) {
             sit.setFromMemory(true);
         } else {
-            LOGGER.warn("No synchronization information in task");
+            LOGGER.trace("No synchronization information in task");
         }
         IterativeTaskInformationType itit = task.getAggregateIterativeTaskInformation();;
         if (itit != null) {
             itit.setFromMemory(true);
         } else {
-            LOGGER.warn("No synchronization information in task");
+            LOGGER.trace("No iterative task information in task");
         }
         return new TaskCurrentStateDto(taskModel.getObject(), sit, itit, task.getProgress());
     }

diff --git a/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java b/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
@@ -208,8 +208,11 @@ private <F extends ObjectType> void projectInternal(LensContext<F> context, Stri
 		        focusProcessor.processFocus(context, activityDescription, now, task, result);
 		        context.recomputeFocus();
 		        if (consistencyChecks) context.checkConsistence();
-
-		        // Process activation of all resources, regardless of the waves. This is needed to properly
+
+				LensUtil.traceContext(LOGGER, activityDescription, "focus processing", false, context, false);
+				LensUtil.checkContextSanity(context, "focus processing", result);
+
+				// Process activation of all resources, regardless of the waves. This is needed to properly
 		        // sort projections to waves as deprovisioning will reverse the dependencies. And we know whether
 		        // a projection is provisioned or deprovisioned only after the activation is processed.
 		        if (fromStart && inFirstWave) {
@@ -225,16 +228,12 @@ private <F extends ObjectType> void projectInternal(LensContext<F> context, Stri
 					assignmentProcessor.removeIgnoredContexts(context);		// TODO move implementation of this method elsewhere; but it has to be invoked here, as activationProcessor sets the IGNORE flag
 		        }
 		        LensUtil.traceContext(LOGGER, activityDescription, "projection activation of all resources", true, context, true);
-
+				if (consistencyChecks) context.checkConsistence();
+
 		        dependencyProcessor.sortProjectionsToWaves(context);
 		        maxWaves = dependencyProcessor.computeMaxWaves(context);
 		        LOGGER.trace("Continuing wave {}, maxWaves={}", context.getProjectionWave(), maxWaves);
 
-		        LensUtil.traceContext(LOGGER, activityDescription,"focus processing", false, context, false);
-		        if (consistencyChecks) context.checkConsistence();
-		        LensUtil.checkContextSanity(context, "focus processing", result);
-
-		        // Focus-related processing is over. Now we will process projections in a loop.
 		        for (LensProjectionContext projectionContext: context.getProjectionContexts()) {
 
                     context.checkAbortRequested();