#defaultValue should not be called from within #use:during:

Johan Brichau · Johan Brichau · commit 4abf40334a87 · 2017-07-23T17:09:12.000+02:00
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,14 +1,11 @@
 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 := Processor activeProcess.
-	oldValue := p environmentAt: self ifAbsent: [self default].
-	[
-		p environmentAt: self put: anObject.
-		result := aBlock value.
-	] ensure: [ 
-		p environmentAt: self put: oldValue 
-	].
-	^ result
+  | 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 := Processor activeProcess.
+  oldValue := p environmentAt: self.
+  [ 
+  p environmentAt: self put: anObject.
+  result := aBlock value ]
+    ensure: [ 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
@@ -1,5 +1,5 @@
 {
 	"class" : {
-		"use:during:" : "JohanBrichau 05/25/2017 08:13" },
+		"use:during:" : "JohanBrichau 07/23/2017 07:39" },
 	"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/GRStringTest.class/methodProperties.json b/repository/Grease-Tests-Core.package/GRStringTest.class/methodProperties.json
@@ -1,35 +1,36 @@
 {
-	"class" : {
-		 },
 	"instance" : {
-		"allowsDuplicateValues" : "jf 2/6/2010 04:22",
+		"testAsUppercase" : "jf 9/25/2009 16:50",
 		"arbitraryCollection" : "jok 2/9/2010 13:19",
+		"testTruncate" : "lr 2/7/2008 09:32",
+		"testCapitalized" : "pmm 9/1/2012 15:24",
+		"includedElement" : "jf 2/6/2010 02:44",
+		"testTruncateEmpty" : "lr 2/7/2008 09:32",
+		"testInflectorNotInflecting" : "mlucas-smith 6/3/2009 22:33",
 		"collectionClass" : "jf 2/6/2010 01:50",
+		"testInflectorTsssSuffixes" : "lr 2/7/2008 09:11",
 		"duplicateElement" : "jf 2/6/2010 02:44",
-		"excludedElement" : "jf 2/6/2010 02:20",
-		"includedElement" : "jf 2/6/2010 02:44",
-		"isExtensible" : "jf 2/6/2010 03:35",
-		"isHomogeneous" : "jok 3/29/2010 13:24",
-		"isInitializable" : "jf 2/9/2010 11:28",
-		"isSequenced" : "jf 2/6/2010 04:04",
-		"isUnique" : "jok 3/29/2010 13:14",
-		"testAsUppercase" : "jf 9/25/2009 16:50",
-		"testCapitalized" : "pmm 9/1/2012 15:24",
-		"testCapitalizedUmlauts" : "jf 9/25/2009 16:50",
-		"testExcerpt" : "lr 2/7/2008 09:31",
-		"testExcerptEmpty" : "lr 2/7/2008 09:31",
 		"testExcerptLeft" : "lr 2/7/2008 09:30",
+		"isExtensible" : "jf 2/6/2010 03:35",
+		"testSubStrings" : "JohanBrichau 5/25/2017 11:31",
 		"testExcerptRight" : "lr 2/7/2008 09:29",
+		"testTrimLeft" : "lr 2/7/2008 09:34",
+		"testExcerptEmpty" : "lr 2/7/2008 09:31",
+		"allowsDuplicateValues" : "jf 2/6/2010 04:22",
+		"testExcerpt" : "lr 2/7/2008 09:31",
+		"testCapitalizedUmlauts" : "jf 9/25/2009 16:50",
+		"testTrimRight" : "lr 2/7/2008 09:35",
+		"testInflectorYyyySuffixes" : "pmm 9/1/2012 15:24",
+		"testTrimBoth" : "jf 9/25/2009 16:46",
 		"testInflectorAssimilated" : "lr 2/7/2008 10:21",
+		"isInitializable" : "jf 2/9/2010 11:28",
 		"testInflectorCommonSuffixes" : "lr 2/7/2008 09:11",
-		"testInflectorFfffSuffixes" : "lr 2/7/2008 09:11",
+		"isHomogeneous" : "jok 3/29/2010 13:24",
+		"isSequenced" : "jf 2/6/2010 04:04",
 		"testInflectorIrregular" : "lr 2/7/2008 10:21",
-		"testInflectorNotInflecting" : "mlucas-smith 6/3/2009 22:33",
-		"testInflectorTsssSuffixes" : "lr 2/7/2008 09:11",
-		"testInflectorYyyySuffixes" : "pmm 9/1/2012 15:24",
-		"testSubStrings" : "JohanBrichau 5/25/2017 11:31",
-		"testTrimBoth" : "jf 9/25/2009 16:46",
-		"testTrimLeft" : "lr 2/7/2008 09:34",
-		"testTrimRight" : "lr 2/7/2008 09:35",
-		"testTruncate" : "lr 2/7/2008 09:32",
-		"testTruncateEmpty" : "lr 2/7/2008 09:32" } }
+		"testInflectorFfffSuffixes" : "lr 2/7/2008 09:11",
+		"excludedElement" : "jf 2/6/2010 02:20",
+		"isUnique" : "jok 3/29/2010 13:14"
+	},
+	"class" : { }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"class" : {`
`3`		`- "use:during:" : "JohanBrichau 05/25/2017 08:13" },`
	`3`	`+ "use:during:" : "JohanBrichau 07/23/2017 07:39" },`
`4`	`4`	`"instance" : {`
`5`	`5`	`} }`