Merge pull request SeasideSt#55 from SeasideSt/fix-grdynvar-gs24

Johan Brichau · web-flow · commit 12472709502c · 2017-10-04T16:44:32.000+02:00
Fix grdynvar gs24
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,33 @@
 language: smalltalk
 sudo: false
 smalltalk:
+  - Pharo-alpha
+  - Pharo-6.1
   - Pharo-6.0
   - Pharo-5.0
   - Pharo-4.0
   - Pharo-3.0
+  - Squeak-trunk
   - Squeak-5.1
-  - GemStone-3.1.0.6
-  - GemStone-3.2.16
-  - GemStone-3.3.4
-cache:
-  directories:
-    - $SMALLTALK_CI_CACHE
-#matrix:
-#  allow_failures:
-#    - smalltalk: Pharo-6.0
+
+matrix:
+  allow_failures:
+    - smalltalk: Pharo-alpha
+    - smalltalk: Squeak-trunk
+  include:
+    - smalltalk: GemStone-2.4.8
+      cache:
+        directories:
+          - $SMALLTALK_CI_CACHE
+    - smalltalk: GemStone-3.1.0.6
+      cache:
+        directories:
+          - $SMALLTALK_CI_CACHE
+    - smalltalk: GemStone-3.2.16
+      cache:
+        directories:
+          - $SMALLTALK_CI_CACHE
+    - smalltalk: GemStone-3.3.4
+      cache:
+        directories:
+          - $SMALLTALK_CI_CACHE
diff --git a/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/value.st b/repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/value.st
@@ -0,0 +1,5 @@
+accessing
+value
+  "Override required for compatibility in GS2.4 where environmentAt:ifAbsent: is flawed because it can still return nil when absent instead of executing the ifAbsent block"
+
+  ^ Processor activeProcess environment at: self ifAbsent: [ self defaultValue ]
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,7 @@
 	"class" : {
 		"default" : "JohanBrichau 07/23/2017 09:48",
 		"defaultValue" : "JohanBrichau 07/23/2017 09:47",
-		"use:during:" : "JB 09/08/2017 00:34" },
+		"use:during:" : "JB 09/08/2017 00:34",
+		"value" : "JB 10/04/2017 04:57" },
 	"instance" : {
 		 } }
diff --git a/repository/Grease-GemStone-Core.package/monticello.meta/version b/repository/Grease-GemStone-Core.package/monticello.meta/version
