[GME-commit] GMESRC/GME/Mga MgaFCO.cpp, 1.39, 1.40 MgaProject.cpp, 1.69, 1.70 MgaTerritory.h, 1.3, 1.4

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

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv17260

Modified Files:
	MgaFCO.cpp MgaProject.cpp MgaTerritory.h 
Log Message:
Mga fix for JIRA-154.
http://escher.isis.vanderbilt.edu/JIRA/browse/GME-154



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaTerritory.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaTerritory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MgaTerritory.h	21 Jul 2006 19:11:40 -0000	1.3
--- MgaTerritory.h	16 Jun 2007 22:45:12 -0000	1.4
***************
*** 36,39 ****
--- 36,41 ----
  		MARKSIG('9'); 
  		if(coreterr) Destroy();	
+ 		coreterr   = 0;
+ 		mgaproject = 0;
  	}
  

Index: MgaFCO.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaFCO.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** MgaFCO.cpp	7 Mar 2007 22:04:32 -0000	1.39
--- MgaFCO.cpp	16 Jun 2007 22:45:12 -0000	1.40
***************
*** 42,45 ****
--- 42,47 ----
  		MARKSIG('9');
  		ASSERT(pubfcos.begin() == pubfcos.end());
+ 		if( mgaproject) 
+ 			mgaproject->Release(); // have been hold since FinalConstruct // zolmol
  }
  

Index: MgaProject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** MgaProject.cpp	7 Mar 2007 22:04:32 -0000	1.69
--- MgaProject.cpp	16 Jun 2007 22:45:12 -0000	1.70
***************
*** 56,59 ****
--- 56,68 ----
  			Close();
  		}
+ 		objstocheck.clear();           // zolmol
+ 		while( !changedobjs.empty())
+ 			changedobjs.pop();
+ 		while( !notifyobjs.empty())
+ 			notifyobjs.pop();
+ 		while( !temporalobjs.empty())
+ 			temporalobjs.pop();
+ 
+ 		deferredchecks.clear();        // end zolmol
  }
  
***************
*** 380,385 ****
  		opened = UNCHANGED;
  		guidstat = CLEAN;
! 	    CComPtr<IMgaTerritory> lm;
! 	    COMTHROW(CreateTerritory(NULL, &lm));
  		COMTHROW(BeginTransaction(lm, TRANSACTION_READ_ONLY));
  
--- 389,394 ----
  		opened = UNCHANGED;
  		guidstat = CLEAN;
! 		CComPtr<IMgaTerritory> lm;
! 		COMTHROW(CreateTerritory(NULL, &lm));
  		COMTHROW(BeginTransaction(lm, TRANSACTION_READ_ONLY));
  
***************
*** 388,392 ****
  			CoreObj  dataroot;
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
! 		    s=dataroot[ATTRID_PARADIGM];
  			mgaversion = dataroot[ATTRID_MGAVERSION];
  			if( mgaversion <= 1L) // Core layer changed the project by adding ATTRID_GUID1..4 for CCoreBinFile
--- 397,401 ----
  			CoreObj  dataroot;
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
! 			s=dataroot[ATTRID_PARADIGM];
  			mgaversion = dataroot[ATTRID_MGAVERSION];
  			if( mgaversion <= 1L) // Core layer changed the project by adding ATTRID_GUID1..4 for CCoreBinFile
***************
*** 402,406 ****
  			throw e;
  		}
! 
  		if(s.Length()) {
  			if (ver.Length()) {
--- 411,415 ----
  			throw e;
  		}
! 		
  		if(s.Length()) {
  			if (ver.Length()) {
***************
*** 571,575 ****
  	}
  	if(baseterr) COMTHROW(AbortTransaction());
! 	
  	COMTRY {
  		{
--- 580,584 ----
  	}
  	if(baseterr) COMTHROW(AbortTransaction());
! 
  	COMTRY {
  		{
***************
*** 600,604 ****
  		RemoveClients();   //
  
! 	 	if(rot) COMTHROW(RevokeActiveObject(rot,NULL));
  		if(dataproject) COMTHROW(dataproject->CloseProject(abort));
  
--- 609,615 ----
  		RemoveClients();   //
  
! 		ASSERT( m_dwRef == 2); // zolmol
! 		if(rot) COMTHROW(RevokeActiveObject(rot,NULL));
! 		ASSERT( m_dwRef == 1); // zolmol
  		if(dataproject) COMTHROW(dataproject->CloseProject(abort));
  
***************
*** 927,931 ****
  STDMETHODIMP CMgaProject::get_Comment(BSTR *pVal)
  {
- 
  	COMTRY {
  		CoreObj self;
--- 938,941 ----
***************
*** 1043,1048 ****
  		CComPtr< CMgaTerritory > ster;
  		CreateComObject(ster);
! 		ster->coreterr = tt.Detach();
! 		ster->mgaproject = this;; 
  		allterrs.push_front(ster);
  		ster->handler=sink;
--- 1053,1058 ----
  		CComPtr< CMgaTerritory > ster;
  		CreateComObject(ster);
! 		ster->coreterr = tt; // zolmol
! 		ster->mgaproject = this;;
  		allterrs.push_front(ster);
  		ster->handler=sink;