Merge branch 'master' into es17.01

2017-03-30 17:33:00 +02:00
parent 00edd5aae2 5273940b82
commit 882922cea5
8 changed files with 234 additions and 78 deletions
--- a/library/configuration/src/json_config.e
+++ b/library/configuration/src/json_config.e
@@ -148,7 +148,9 @@ feature -- Access
 			-- `k' can be a single name such as "foo",
 			-- or a qualified name such as "foo.bar" (assuming that "foo" is associated with a JSON object).
 		do
-			if attached json_value as obj then
+			if k.is_empty then
+				Result := json_value
+			elseif attached json_value as obj then
 				Result := object_json_value (obj, k.to_string_32)
 			end
 		end