GUACAMOLE-641: Consider null token mapping (blank YAML) to be empty.
This commit is contained in:
1 parent
aee1b13b2b
commit
b6e6800c0d
1 file changed
+7
-1
+7
-1
@@ -97,7 +97,13 @@ public abstract class VaultConfigurationService {
|
|||||||
|
|
||||||
// Deserialize token mapping from YAML
|
// Deserialize token mapping from YAML
|
||||||
try {
|
try {
|
||||||
return mapper.readValue(confFile, new TypeReference<Map<String, String>>() {});
|
|
||||||
|
Map<String, String> mapping = mapper.readValue(confFile, new TypeReference<Map<String, String>>() {});
|
||||||
|
if (mapping == null)
|
||||||
|
return Collections.emptyMap();
|
||||||
|
|
||||||
|
return mapping;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fail if YAML is invalid/unreadable
|
// Fail if YAML is invalid/unreadable
|
||||||
|
|||||||
Reference in new issue
Block a user