[commit] r1081 - in branches/ServiceReleases_for_10.8.18: . Doc GME/Gme GME/Mga Install SDK/BON/Common Tests/GPyUnit/GME-297
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Nov 15 12:16:27 CST 2010
Author: volgy
Date: Mon Nov 15 12:16:27 2010
New Revision: 1081
Log:
Merging changes from the trunk and preparing release 10.11.15.
Added:
branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test4-correct.mga
- copied unchanged from r1080, trunk/Tests/GPyUnit/GME-297/test4-correct.mga
branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test4.mga
- copied unchanged from r1080, trunk/Tests/GPyUnit/GME-297/test4.mga
Modified:
branches/ServiceReleases_for_10.8.18/ (props changed)
branches/ServiceReleases_for_10.8.18/Doc/README_in.txt
branches/ServiceReleases_for_10.8.18/GME/Gme/GMEVersion.h
branches/ServiceReleases_for_10.8.18/GME/Mga/MgaComplexOps.cpp
branches/ServiceReleases_for_10.8.18/Install/GME_dyn.wxi
branches/ServiceReleases_for_10.8.18/Install/symbols.cmd
branches/ServiceReleases_for_10.8.18/SDK/BON/Common/BONImpl.cpp
branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test.py
Modified: branches/ServiceReleases_for_10.8.18/Doc/README_in.txt
==============================================================================
--- branches/ServiceReleases_for_10.8.18/Doc/README_in.txt Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/Doc/README_in.txt Mon Nov 15 12:16:27 2010 (r1081)
@@ -30,6 +30,15 @@
1. Release Notes
************************************************
+Release Notes of Release r10.11.15
+----------------------------------
+ - This is a service release for r10.8.18
+ Hence, it is binary compatible with that.
+ - Re-fixing GME-297: Refport connections
+ deleted when referent moved
+ - Fixing GME-312: BON2 refport cache not
+ properly invalidated
+
Release Notes of Release r10.11.10
----------------------------------
- This is a service release for r10.8.18
@@ -43,7 +52,6 @@
- Fixing GME-210: copying folders with subfolder (MGA)
- Fixing GME-297 ang GME-311: crashes and other bugs in MGA
while moving FCOs
- -
Release Notes of Release r10.10.10
----------------------------------
Modified: branches/ServiceReleases_for_10.8.18/GME/Gme/GMEVersion.h
==============================================================================
--- branches/ServiceReleases_for_10.8.18/GME/Gme/GMEVersion.h Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/GME/Gme/GMEVersion.h Mon Nov 15 12:16:27 2010 (r1081)
@@ -3,7 +3,7 @@
#define GME_VERSION_MAJOR 10 // MAJOR = Last two digits of Year
#define GME_VERSION_MINOR 11 // MINOR = Month
-#define GME_VERSION_PLEVEL 10 // PATCH LEVEL = Day
+#define GME_VERSION_PLEVEL 15 // PATCH LEVEL = Day
#define _VERSION_STRING2(x) #x
#define _VERSION_STRING(x) _VERSION_STRING2(x)
Modified: branches/ServiceReleases_for_10.8.18/GME/Mga/MgaComplexOps.cpp
==============================================================================
--- branches/ServiceReleases_for_10.8.18/GME/Mga/MgaComplexOps.cpp Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/GME/Mga/MgaComplexOps.cpp Mon Nov 15 12:16:27 2010 (r1081)
@@ -773,19 +773,19 @@
// connection 'rel_owner' is not in internals and 'conn_seg' is the actual connection end (not an intermediary)
CoreObjs conn_segs = self[ATTRID_SEGREF + ATTRID_COLLECTION];
ITERATE_THROUGH(conn_segs) {
- metaid_type st = GetMetaID(ITER);
+ CoreObj conn_seg = ITER;
+ metaid_type st = GetMetaID(conn_seg);
ASSERT(st == DTID_CONNROLESEG);
if (st != DTID_CONNROLESEG) {
continue;
}
- CoreObj role = ITER[ATTRID_CONNSEG];
- CoreObj rel_owner = ITER.GetMgaObj();
- if (!rel_owner || !role) {
+ CoreObj rel_owner = conn_seg.GetMgaObj();
+ if (!rel_owner) {
continue; // connection might be deleted due to a previous relation
}
- ASSERT(GetMetaID(role) == DTID_CONNROLE);
ASSERT(GetMetaID(rel_owner) == DTID_CONNECTION);
#ifdef _DEBUG
+ CoreObj role = conn_seg[ATTRID_CONNSEG];
CComBSTR conn_name = rel_owner[ATTRID_NAME], role_name = role[ATTRID_NAME];
#endif
ASSERT(ObjForCore(rel_owner)->simpleconn()); // KMS: don't think we can get here without a simpleconn
@@ -795,21 +795,10 @@
case MM_ERROR: COMTHROW(E_MGA_OP_REFUSED);
break;
case MM_CLEAR:
- CoreObjs refport_refs = role[ATTRID_CONNSEG+ATTRID_COLLECTION]; // i.e. refport containers
- long count;
- COMTHROW(refport_refs->get_Count(&count));
- if (count == 0) {
- // i.e. not a refport
- ASSERT(FALSE);
- continue;
- }
- CComPtr<ICoreObject> refport_ref;
- COMTHROW(refport_refs->get_Item(1, &refport_ref));
- CoreObj end_refport_ref(refport_ref.p);
- // i.e. if (end_refport_ref == ITER)
- if (GetMetaID(end_refport_ref) == GetMetaID(ITER) && end_refport_ref.GetObjID() == ITER.GetObjID())
+ if (conn_seg[ATTRID_SEGORDNUM] == 1) {
ObjForCore(rel_owner)->inDeleteObject();
- break;
+ break;
+ }
}
}
}
Modified: branches/ServiceReleases_for_10.8.18/Install/GME_dyn.wxi
==============================================================================
--- branches/ServiceReleases_for_10.8.18/Install/GME_dyn.wxi Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/Install/GME_dyn.wxi Mon Nov 15 12:16:27 2010 (r1081)
@@ -1,6 +1,6 @@
<!-- DO NOT EDIT THIS FILE. WILL BE REGENERATED BY THE BUILD SCRIPTS -->
<Include>
- <?define VERSIONSTR='10.11.10' ?>
+ <?define VERSIONSTR='10.11.15' ?>
<?define GUIDSTRMETAGME='{9D3F9884-FE60-409C-8FC1-45789193989B}' ?>
<?define GUIDSTRHFSM='{757682DE-E57F-4003-9A7E-8EE5C0368980}' ?>
<?define GUIDSTRSF='{A47F17D5-E360-4395-8351-AE3A1A843468}' ?>
Modified: branches/ServiceReleases_for_10.8.18/Install/symbols.cmd
==============================================================================
--- branches/ServiceReleases_for_10.8.18/Install/symbols.cmd Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/Install/symbols.cmd Mon Nov 15 12:16:27 2010 (r1081)
@@ -1,3 +1,3 @@
-set VERSION=10.11.10
+set VERSION=10.11.15
set DBGTOOLS=C:\Program Files\Debugging Tools for Windows (x64)
"%DBGTOOLS%\symstore.exe" add /f %GME_ROOT%/Install/GME-%VERSION%-symbols /s \\atlantis\project\GME\symbols /r /t GME /v %VERSION% /c "GME Release %VERSION% symbols added" /compress
\ No newline at end of file
Modified: branches/ServiceReleases_for_10.8.18/SDK/BON/Common/BONImpl.cpp
==============================================================================
--- branches/ServiceReleases_for_10.8.18/SDK/BON/Common/BONImpl.cpp Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/SDK/BON/Common/BONImpl.cpp Mon Nov 15 12:16:27 2010 (r1081)
@@ -3880,6 +3880,15 @@
void FCOImpl::onObjectCreated()
{
FCO( this->getType() );
+ if (getParentModelI())
+ {
+ ReferenceSet references = getParentModelI()->getReferencesI();
+ for ( ReferenceSet::iterator it = references.begin() ; it != references.end() ; ++it )
+ {
+ (**it).m_bAllChildPorts = false;
+ }
+ }
+
try {
std::set<ReferencePort> rps = getReferencePorts();
for( std::set<ReferencePort>::const_iterator it = rps.begin(); it != rps.end(); ++it)
Modified: branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test.py
==============================================================================
--- branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test.py Mon Nov 15 10:18:28 2010 (r1080)
+++ branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test.py Mon Nov 15 12:16:27 2010 (r1081)
@@ -43,13 +43,14 @@
import mgadiff
if not mgadiff.compare(self.correct_file, self.output_file):
self.fail("Reference file '%s' does not match output '%s'" % (self.correct_file, self.output_file))
- #print "Reference file '%s' matches output '%s'" % (self.correct_file, self.output_file)
+ print "Reference file '%s' matches output '%s'" % (self.correct_file, self.output_file)
def suite():
suite = unittest.TestSuite()
suite.addTest(TestRefportConnectionInvariantUnderMoves(input_file="test1.mga", fco_to_move="/Test1/Folder1/A/B", destination_model="/Test1/Folder2/C"))
suite.addTest(TestRefportConnectionInvariantUnderMoves(input_file="test2.mga", fco_to_move="/Test2/Subtypes/A/BSubtypeRef", destination_model="/Test2/Destination/Destination"))
suite.addTest(TestRefportConnectionInvariantUnderMoves(input_file="test1.mga", fco_to_move="/Test1/Folder1/A/RefB", destination_model="/Test1/Folder2/C", name="test3"))
+ suite.addTest(TestRefportConnectionInvariantUnderMoves(input_file="test4.mga", fco_to_move="/Test4/Folder1/A/RefRefB", destination_model="/Test4/Folder2/C"))
return suite
if __name__ == "__main__":
Copied: branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test4-correct.mga (from r1080, trunk/Tests/GPyUnit/GME-297/test4-correct.mga)
==============================================================================
Binary file (source and/or target). No diff available.
Copied: branches/ServiceReleases_for_10.8.18/Tests/GPyUnit/GME-297/test4.mga (from r1080, trunk/Tests/GPyUnit/GME-297/test4.mga)
==============================================================================
Binary file (source and/or target). No diff available.
More information about the gme-commit
mailing list