[Mobies-commit] [commit] r4319 - UDM/trunk/src/UdmGme

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed Sep 24 09:50:37 2014
New Revision: 4319

Log:
UdmGme: getParent with role: check for Folder parent

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

Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp	Wed Sep 24 09:50:31 2014	(r4318)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp	Wed Sep 24 09:50:37 2014	(r4319)
@@ -2162,8 +2162,13 @@
 			
 			
 
-			IMgaMetaRolePtr real_role;			
+			IMgaMetaRolePtr real_role;
 			COMTHROW (self->get_MetaRole(&real_role));
+			if (real_role == NULL)
+			{
+				return &Udm::_null;
+				//throw udm_exception("Object " + this->getPath() + " has a Folder parent, and thus no composition role");
+			}
 			::Uml::CompositionChildRole ccr = Uml::theOther(role);
 			
 			//in most cases, the role name matches