+ fix bugs before release

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.jcr / src / main / java / org / argeo / slc / jcr / SlcJcrUtils.java

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
index 3473827cdd7a2e921cd12f9905689c8442fefdc7..693389d119fe02bd1ce462c93061a988b7ce18c7 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -196,9 +196,14 @@ public class SlcJcrUtils implements SlcNames {
 
                        NodeIterator it = node.getNodes();
                        while (it.hasNext()) {
-                               Integer childStatus = aggregateTestStatus(it.nextNode());
-                               if (childStatus > status)
-                                       status = childStatus;
+                               Node curr = it.nextNode();
+
+                               // Manually skip aggregated status
+                               if (!SlcNames.SLC_AGGREGATED_STATUS.equals(curr.getName())) {
+                                       Integer childStatus = aggregateTestStatus(curr);
+                                       if (childStatus > status)
+                                               status = childStatus;
+                               }
                        }
                        return status;
                } catch (Exception e) {
@@ -232,7 +237,10 @@ public class SlcJcrUtils implements SlcNames {
                        NodeIterator it = node.getNodes();
                        while (it.hasNext()) {
                                Node child = it.nextNode();
-                               aggregateTestMessages(child, messages);
+                               // Manually skip aggregated status
+                               if (!SlcNames.SLC_AGGREGATED_STATUS.equals(child.getName())) {
+                                       aggregateTestMessages(child, messages);
+                               }
                        }
                        return messages;
                } catch (Exception e) {
@@ -243,6 +251,5 @@ public class SlcJcrUtils implements SlcNames {
 
        /** Prevents instantiation */
        private SlcJcrUtils() {
-
        }
-}
+}
\ No newline at end of file