[GME-commit] GMESRC/GME/ConstraintManager OCLTree.cpp,1.27,1.28 OCLObjectExGME.cpp,1.8,1.9

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/ConstraintManager
In directory braindrain:/tmp/cvs-serv22503

Modified Files:
	OCLTree.cpp OCLObjectExGME.cpp 
Log Message:
vonstraint violation + null ref 

CVS User: bogyom

Index: OCLTree.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLTree.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** OCLTree.cpp	13 Sep 2004 14:14:53 -0000	1.27
--- OCLTree.cpp	8 Oct 2004 18:16:18 -0000	1.28
***************
*** 294,299 ****
  		for ( int i = 0 ; i < vecItems.size() ; i++ ) {
  //			ObjectContextStack::StateItem itemx = vecItems[i];
! 			violation.vecVariables.push_back( vecItems[ i ].name );
! 			violation.vecObjects.push_back( vecItems[ i ].item.Print() );
  			IUnknown* iu;
  			iu = vecItems[ i ].item.GetObject();
--- 294,301 ----
  		for ( int i = 0 ; i < vecItems.size() ; i++ ) {
  //			ObjectContextStack::StateItem itemx = vecItems[i];
! 			string nam = vecItems[ i ].name;
! 			violation.vecVariables.push_back( nam );
! 			string str = vecItems[ i ].item.Print();
! 			violation.vecObjects.push_back( str );
  			IUnknown* iu;
  			iu = vecItems[ i ].item.GetObject();

Index: OCLObjectExGME.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLObjectExGME.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OCLObjectExGME.cpp	14 Jun 2004 20:28:23 -0000	1.8
--- OCLObjectExGME.cpp	8 Oct 2004 18:16:18 -0000	1.9
***************
*** 69,73 ****
  	void Object::SetTypeName()
  	{
! 		if ( m_Value.p )
  			m_strTypeName = "meta::" + OclCommonEx::GetObjectKind( m_Value );
  	}
--- 69,73 ----
  	void Object::SetTypeName()
  	{
! 		if ( m_Value != NULL  &&  m_Value.p )
  			m_strTypeName = "meta::" + OclCommonEx::GetObjectKind( m_Value );
  	}
***************
*** 94,97 ****
--- 94,102 ----
  	int Object::GetValue( CComPtr<IMgaFolder>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 105,108 ****
--- 110,118 ----
  	int Object::GetValue( CComPtr<IMgaFCO>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 116,119 ****
--- 126,134 ----
  	int Object::GetValue( CComPtr<IMgaModel>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 127,130 ****
--- 142,150 ----
  	int Object::GetValue( CComPtr<IMgaAtom>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 138,141 ****
--- 158,166 ----
  	int Object::GetValue( CComPtr<IMgaReference>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 149,152 ****
--- 174,182 ----
  	int Object::GetValue( CComPtr<IMgaConnection>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 160,163 ****
--- 190,198 ----
  	int Object::GetValue( CComPtr<IMgaSet>& value ) const
  	{
+ 		if (m_Value == NULL)
+ 		{
+ 			value = NULL;
+ 			return 0;
+ 		}
  		return m_Value->QueryInterface( &value );
  	}
***************
*** 193,196 ****
--- 228,233 ----
  	IUnknown* Object::GetObject() const
  	{
+ 		if (m_Value == NULL)
+ 			return NULL;
  		IUnknown* ret = NULL;
  		m_Value.QueryInterface(&ret);