[commit] r1539 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep 14 16:38:32 2011
New Revision: 1539

Log:
Dont use nested transactions in MoveFCOs and CopyFCOs

Modified:
   trunk/GME/Mga/MgaComplexOps.cpp

Modified: trunk/GME/Mga/MgaComplexOps.cpp
==============================================================================
--- trunk/GME/Mga/MgaComplexOps.cpp	Wed Sep 14 15:56:52 2011	(r1538)
+++ trunk/GME/Mga/MgaComplexOps.cpp	Wed Sep 14 16:38:32 2011	(r1539)
@@ -1021,7 +1021,7 @@
 
 
 HRESULT FCO::CopyFCOs(IMgaFCOs *copylist, IMgaMetaRoles *rlist,IMgaFCOs **objs) {
-	COMTRY_IN_TRANSACTION {
+	COMTRY_IN_TRANSACTION_MAYBE {
 		CheckWrite();
 		CHECK_MYINPTRSPAR(copylist);
 		long cnt;
@@ -1134,12 +1134,12 @@
 
 		SelfMark(OBJEVENT_NEWCHILD);
 
-	} COMCATCH_IN_TRANSACTION(;);
+	} COMCATCH_IN_TRANSACTION_MAYBE(;);
 }
 
 HRESULT FCO::CopyFCODisp(IMgaFCO *copiedobj, IMgaMetaRole *role, IMgaFCO **nobj)
 {
-	COMTRY_IN_TRANSACTION {
+	COMTRY_IN_TRANSACTION_MAYBE {
 		CComPtr<IMgaFCO> new_fco;
 
 		// copy in param to a folder coll
@@ -1164,7 +1164,7 @@
 		if( nobj) {
 			*nobj = new_fco.Detach();
 		}
-	} COMCATCH_IN_TRANSACTION(;);
+	} COMCATCH_IN_TRANSACTION_MAYBE(;);
 }
 
 
@@ -1309,7 +1309,7 @@
 
 
 HRESULT FCO::MoveFCOs(IMgaFCOs *movelist, IMgaMetaRoles *rlist,IMgaFCOs **objs) {
-	COMTRY_IN_TRANSACTION {
+	COMTRY_IN_TRANSACTION_MAYBE {
 		CheckWrite();
 		CHECK_MYINPTRSPAR(movelist);
 		long cnt;
@@ -1472,12 +1472,12 @@
 			SelfMark(OBJEVENT_NEWCHILD);
 		} // if valid
 
-	} COMCATCH_IN_TRANSACTION(;);
+	} COMCATCH_IN_TRANSACTION_MAYBE(;);
 }
 
 HRESULT FCO::MoveFCODisp(IMgaFCO *movedobj, IMgaMetaRole *role, IMgaFCO **nobj)
 {
-	COMTRY_IN_TRANSACTION {
+	COMTRY_IN_TRANSACTION_MAYBE {
 		CComPtr<IMgaFCO> new_fco;
 
 		// copy in param to a folder coll
@@ -1502,7 +1502,7 @@
 		if( nobj) {
 			*nobj = new_fco.Detach();
 		}
-	} COMCATCH_IN_TRANSACTION(;);
+	} COMCATCH_IN_TRANSACTION_MAYBE(;);
 }