commit 379ea0bf87bf32f374fd50c7f2c066c7c0e479df
author jmisinco <misinco@gmail.com> Fri May 04 10:01:17 2012 -0700
committer Roberto E. Escobar <roberto.e.escobar@boeing.com> Fri May 04 10:01:17 2012 -0700
tree da8dad8390bcbfd5f5bdc0e72edecdc5a83f4be9
parent 595be40fea8e2d3e3fa9a71c20237878f4024f23

bug[ats_NJ06M]: Relation order getting deleted from goals

plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
index 840ed5a..24f6eb5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
@@ -142,12 +142,15 @@
       try {
          Artifact aArtifact = ArtifactQuery.getArtifactFromId(aArtifactId, branch);
 
-         if (aArtifact.getAttributeCount(CoreAttributeTypes.RelationOrder) == 1 && aArtifact.getChildren().isEmpty()) {
-            aArtifact.getSoleAttribute(CoreAttributeTypes.RelationOrder).delete();
-            if (transaction == null) {
-               aArtifact.persist("Delete empty relation order attribute for artifact: " + aArtifact.getGuid());
-            } else {
-               aArtifact.persist(transaction);
+         if (aArtifact.getAttributeCount(CoreAttributeTypes.RelationOrder) == 1) {
+            RelationOrderData relationOrderData = new RelationOrderFactory().createRelationOrderData(aArtifact);
+            if (!relationOrderData.hasEntries()) {
+               aArtifact.getSoleAttribute(CoreAttributeTypes.RelationOrder).delete();
+               if (transaction == null) {
+                  aArtifact.persist("Delete empty relation order attribute for artifact: " + aArtifact.getGuid());
+               } else {
+                  aArtifact.persist(transaction);
+               }
             }
          }