safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-641: Consider null token mapping (blank YAML) to be empty.

Browse Source
This commit is contained in:
Michael Jumper
2022-01-21 15:23:41 -08:00
parent aee1b13b2b
commit b6e6800c0d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java
View File

@@ -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