From d2b45d1cdb1a9830be7b87c2d3ed3456b5a6186e Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sat, 27 Dec 2014 14:42:06 -0800
Subject: [PATCH] GUAC-969: Fix possible NPE in reading of local environment.

---
 .../glyptodon/guacamole/environment/LocalEnvironment.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
index c96f0dd4d..5421bceec 100644
--- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
+++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/environment/LocalEnvironment.java
@@ -239,6 +239,12 @@ public class LocalEnvironment implements Environment {
                 }
             );
 
+            // Warn if directory contents are not available
+            if (files == null) {
+                logger.error("Unable to read contents of \"{}\".", protocol_directory.getAbsolutePath());
+                files = new File[0];
+            }
+            
             // Load each protocol from each file
             for (File file : files) {