[Mobies-commit] [commit] r3590 - UDM/trunk/src/UdmCopy

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Dec 30 12:55:50 2010
New Revision: 3590

Log:
Use CHANGES_LOST_DEFAULT to prevent crash. See Udm-54

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

Modified: UDM/trunk/src/UdmCopy/UdmCopy.cpp
==============================================================================
--- UDM/trunk/src/UdmCopy/UdmCopy.cpp	Tue Dec 14 14:36:48 2010	(r3589)
+++ UDM/trunk/src/UdmCopy/UdmCopy.cpp	Thu Dec 30 12:55:50 2010	(r3590)
@@ -79,7 +79,7 @@
 			// from source object to standalone library object
 			Udm::SmartDataNetwork libDN(m_meta);
 			const ::Uml::Class & safe_type = ::Uml::SafeTypeContainer::GetSafeType(p_srcChild->type());
-			libDN.CreateNew(new_lib_name, m_metaloc, safe_type, Udm::CHANGES_PERSIST_ALWAYS);
+			libDN.CreateNew(new_lib_name, m_metaloc, safe_type, Udm::CHANGES_LOST_DEFAULT);
 			Object p_root = libDN.GetRootObject();
 			ObjectImpl *p_libRoot = p_root.__impl();
 
@@ -178,7 +178,7 @@
 			fromDN.OpenExisting(argv[1],"", Udm::CHANGES_LOST_DEFAULT);
 			
 			const ::Uml::Class & safe_type = ::Uml::SafeTypeContainer::GetSafeType(fromDN.GetRootObject().type());
-			toDN.CreateNew(argv[2], metaloc, safe_type, Udm::CHANGES_PERSIST_DEFAULT);
+			toDN.CreateNew(argv[2], metaloc, safe_type, Udm::CHANGES_LOST_DEFAULT);
 
 			string toDN_name = argv[2];
 			string toDN_ext = toDN_name.substr(toDN_name.length() - 3, 3);
@@ -188,6 +188,8 @@
 			UdmUtil::copy_assoc_map dummy;
 			cp.Copy(fromDN.GetRootObject().__impl(), toDN.GetRootObject().__impl(), &toDN, dummy);
 
+			toDN.CloseWithUpdate();
+
 		}
 
 		catch(udm_exception u) {