Attempt to correctly show model contexts with null ResourceShadowDisc…

…riminator.
Evolveum · Oct 6, 2014 · 02accc6 · 02accc6
1 parent dbb0f1e
commit 02accc6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportActivityDto.java b/...src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportActivityDto.java
@@ -95,10 +95,15 @@ public boolean correspondsTo(ProgressInformation newStatus) {
         if (activityType != newStatus.getActivityType()) {
             return false;
         }
-        if (activityType == RESOURCE_OBJECT_OPERATION
-                && (resourceShadowDiscriminator == null ||
-                    !resourceShadowDiscriminator.equals(newStatus.getResourceShadowDiscriminator()))) {
-            return false;
+        if (activityType == RESOURCE_OBJECT_OPERATION) {
+            if (resourceShadowDiscriminator != null &&
+                    !resourceShadowDiscriminator.equals(newStatus.getResourceShadowDiscriminator())) {
+                return false;
+            }
+            if (resourceShadowDiscriminator == null && newStatus.getResourceShadowDiscriminator() != null) {
+                // actually, we consider all resource-related records with null RSD to be equal (even if they deal with different resources)
+                return false;
+            }
         }
         return true;
     }