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

GUAC-586: Ensure LocalEnvironment is tolerant to failues in loading guacamole.properties.

Browse Source
This commit is contained in:
Michael Jumper
2015-08-28 11:28:00 -07:00
parent 405448116f
commit 0d92876d23
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
View File

@@ -119,7 +119,8 @@ public class LocalEnvironment implements Environment {
} }
catch (IOException e) { catch (IOException e) {
throw new GuacamoleServerException("Error reading guacamole.properties", e); logger.warn("The guacamole.properties file within GUACAMOLE_HOME cannot be read: {}", e.getMessage());
logger.debug("Error reading guacamole.properties.", e);
} }
// Read all protocols // Read all protocols
@@ -190,11 +191,8 @@ public class LocalEnvironment implements Environment {
* *
* @return * @return
* A map of all available protocols. * A map of all available protocols.
*
* @throws GuacamoleException
* If an error occurs while reading the various protocol JSON files.
*/ */
private Map<String, ProtocolInfo> readProtocols() throws GuacamoleException { private Map<String, ProtocolInfo> readProtocols() {
// Map of all available protocols // Map of all available protocols
Map<String, ProtocolInfo> protocols = new HashMap<String, ProtocolInfo>(); Map<String, ProtocolInfo> protocols = new HashMap<String, ProtocolInfo>();