Merge pull request SeasideSt#44 from SeasideSt/fix-grdynamicvar

Johan Brichau · web-flow · commit 9043ed17e54c · 2017-09-09T12:04:35.000+02:00
Fixes for GRDynamicVariable in GemStone
diff --git a/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/use.during..st b/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/use.during..st
@@ -1,11 +1,18 @@
 accessing
 use: anObject during: aBlock
-  | p oldValue result |
-  "Proper implementation instead of use 'super value:during:' because that one does not return value, perhaps this should be fixed in DynamicVariable?"
+  | p hasOldValue oldValue result |
+  "Implementation cannot send a supercall to value:during: because:
+   - this method needs to return the value
+   - the defaultValue may not be invoked here to support throwing errors as defaultValue
+   - nil may not remain installed as the default value once the block has finished running"
   p := Processor activeProcess.
+  hasOldValue := p environment includesKey: self.
   oldValue := p environmentAt: self.
   [ 
   p environmentAt: self put: anObject.
   result := aBlock value ]
-    ensure: [ p environmentAt: self put: oldValue ].
+    ensure: [ 
+      hasOldValue
+        ifFalse: [ p environment removeKey: self ]
+        ifTrue: [ p environmentAt: self put: oldValue ] ].
   ^ result
diff --git a/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/methodProperties.json b/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/methodProperties.json
@@ -2,6 +2,6 @@
 	"class" : {
 		"default" : "JohanBrichau 07/23/2017 09:48",
 		"defaultValue" : "JohanBrichau 07/23/2017 09:47",
-		"use:during:" : "JohanBrichau 07/23/2017 07:39" },
+		"use:during:" : "JB 09/08/2017 00:34" },
 	"instance" : {
 		 } }
diff --git a/repository/Grease-GemStone-Core.package/monticello.meta/version b/repository/Grease-GemStone-Core.package/monticello.meta/version
diff --git a/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/instance/testDefaultValue.st b/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/instance/testDefaultValue.st
@@ -1,3 +1,9 @@
 tests
 testDefaultValue
-	self assert: GRTestDynamicVariable value = 'default test value'
+	self assert: GRTestDynamicVariable value = 'default test value'.
+	
+	GRTestDynamicVariable
+		use: 'my value'
+		during: [  ].
+	self assert: GRTestDynamicVariable value = 'default test value' description:'The default value is no longer correct'.	
+	
diff --git a/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/methodProperties.json b/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"testWithoutValue" : "MaxLeske 5/18/2017 07:42",
 		"testAnswer" : "MaxLeske 5/18/2017 07:42",
 		"testWithNestedValue" : "MaxLeske 5/18/2017 07:42",
-		"testDefaultValue" : "JohanBrichau 7/23/2017 16:57",
+		"testDefaultValue" : "JohanBrichau 9/8/2017 09:53",
 		"testWithValue" : "MaxLeske 5/18/2017 07:42"
 	},
 	"class" : { }
diff --git a/repository/Grease-Tests-Core.package/monticello.meta/version b/repository/Grease-Tests-Core.package/monticello.meta/version
