unexpected semantics of #doTransaction: with multithreading (used in WAGemStoneServiceTask)

Johan Brichau · Johan Brichau · commit de396c9ec1d3 · 2014-03-21T17:48:26.000+01:00
diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/doTransaction..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/doTransaction..st
@@ -1,18 +1,20 @@
-transactions
+*grease-gemstone-core
 doTransaction: aBlock
 	"Evaluate aBlock in a transaction. 
 	 Return true if the transaction succeeds and false if the transaction fails.
 	 Nested calls are allowed and will always return true.
 	 See System class>>transactionConflicts for dealing with failed transactions."
 
-	System inTransaction
-		ifTrue: [ "We alread in a transaction, so just evaluate the block"
-			aBlock value.
-			^true].
+	"Ensure that each block evaluation is mutually exclusive: https://code.google.com/p/glassdb/issues/detail?id=355"
 	self transactionMutex critical: [
 		"Get the transactionMutex, and perform the transaction."
-		[ 
-			self doBeginTransaction.
-			aBlock value.
-		] ensure: [ 
-			^self doCommitTransaction]].
+		System inTransaction
+			ifTrue: [ "We already are in a transaction, so just evaluate the block"
+					aBlock value.
+					^ true]
+			ifFalse:[ 
+					[
+						self doBeginTransaction.
+						aBlock value
+					] ensure: [ ^self doCommitTransaction]]]
+	
diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json
@@ -15,7 +15,7 @@
 		"doAbortTransaction" : "dkh 11/06/2009 08:41",
 		"doBeginTransaction" : "dkh 11/06/2009 08:41",
 		"doCommitTransaction" : "dkh 11/06/2009 08:41",
-		"doTransaction:" : "dkh 11/06/2009 08:41",
+		"doTransaction:" : "JohanBrichau 03/21/2014 17:45",
 		"ensureExistenceOfFolder:" : "DaleHenrichs 12/03/2010 16:28",
 		"filesIn:" : "DaleHenrichs 09/02/2010 15:45",
 		"isProcessTerminated:" : "dkh 11/06/2009 08:41",
