[Mobies-commit] [commit] r4418 - UDM/trunk/src/UdmDom

[ksmyth at svn.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu May 17 11:58:03 2018
New Revision: 4418

Log:
UdmDom: when deleting DomObject, delete progeny's placeholder objects also. Fixes GReAT bug where links remain to progeny when ancestor is deleted

Modified:
   UDM/trunk/src/UdmDom/UdmDom.cpp

Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp	Tue Apr  3 13:26:46 2018	(r4417)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp	Thu May 17 11:58:03 2018	(r4418)
@@ -1562,6 +1562,20 @@
 
 			TRY_XML_EXCEPTION
 
+
+			//if this datanetwork is part of a project,
+			//I might have a placeholder object,
+			//which also should be deleted
+			Udm::UdmProject * pr = NULL;
+			if (__getdn())
+				pr = __getdn()->GetProject();
+			if (pr)
+			{
+				Object po = pr->GetPlaceHolder(clone(), false);
+				if (po)
+					po.DeleteObject();
+			}
+
 			// delete associations the element is involved in
 
 			const XMLCh *myid = dom_element->getAttribute(gXML__id);
@@ -1855,17 +1869,6 @@
 				{  //delete parent
 
 
-					//if this datanetwork is part of a project,
-					//I might have a placeholder object,
-					//which also should be deleted
-					Udm::UdmProject * pr = NULL;
-					if (__getdn()) pr = __getdn()->GetProject();
-					if (pr)
-					{
-						Object po = pr->GetPlaceHolder(clone(), false);
-						if (po) po.DeleteObject();
-					}
-
 					{
 						//unlink all derived objects
 						//unlink all instances