implement a workaround for GemStone internal Bug 42963: ensure: block executed twice (don't return from ensure: block)

dalehenrich · dalehenrich · commit fa7224f67c4b · 2014-12-21T19:00:50.000-08: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,20 +1,26 @@
 *grease-gemstone-core
 doTransaction: aBlock
-	"Evaluate aBlock in a transaction. 
+  "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."
 
-	"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."
-		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]]]
-	
+  "Ensure that each block evaluation is mutually exclusive: https://code.google.com/p/glassdb/issues/detail?id=355"
+
+  self transactionMutex
+    critical: [ 
+      | commitResult |
+      "Get the transactionMutex, and perform the transaction."
+      System inTransaction
+        ifTrue: [ 
+          "We already are in a transaction, so just evaluate the block"
+          aBlock value.
+          ^ true ]
+        ifFalse: [ 
+          [ 
+          self doBeginTransaction.
+          aBlock value ]
+            ensure: [ 
+              "workaround for Bug 42963: ensure: block executed twice (don't return from ensure: block)"
+              commitResult := self doCommitTransaction ] ].
+      ^ commitResult ]
diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json
@@ -16,7 +16,7 @@
 		"doAbortTransaction" : "dkh 11/06/2009 08:41",
 		"doBeginTransaction" : "dkh 11/06/2009 08:41",
 		"doCommitTransaction" : "dkh 11/06/2009 08:41",
-		"doTransaction:" : "JohanBrichau 03/21/2014 17:45",
+		"doTransaction:" : "dkh 12/21/2014 16:11",
 		"ensureExistenceOfFolder:" : "DaleHenrichs 12/03/2010 16:28",
 		"filesIn:" : "DaleHenrichs 09/02/2010 15:45",
 		"isProcessTerminated:" : "dkh 11/06/2009 08:41",
diff --git a/repository/Grease-GemStone-Core.package/monticello.meta/version b/repository/Grease-GemStone-Core.package/monticello.meta/version
