From d477f7fa6eaabda5ae70506aded6be15a30f80db Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 15 May 2015 17:39:17 +0000 Subject: [PATCH] GUAC-587: Do not attempt to read contents of GUACAMOLE_HOME/extensions if not accessible. --- .../guacamole/net/basic/extension/ExtensionModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java index aabc06a62..adbe6a0e2 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java @@ -246,8 +246,10 @@ public class ExtensionModule extends ServletModule { }); // Verify contents are accessible - if (extensionFiles == null) + if (extensionFiles == null) { logger.warn("Although GUACAMOLE_HOME/" + EXTENSIONS_DIRECTORY + " exists, its contents cannot be read."); + return; + } // Load each extension within the extension directory for (File extensionFile : extensionFiles) {