From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Fri, 15 Jul 2011 07:26:26 +0000 (-0700)
Subject: Handle possible NPE in mapping loader.
X-Git-Url: http://git.alex.org.uk

Handle possible NPE in mapping loader.
---

diff --git a/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index ce8d5b8..a00d6ee 100644
--- a/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -100,6 +100,11 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider {
 
         }
 
+        // If no mapping available, report as such
+        if (mapping == null)
+            throw new GuacamoleException("User mapping could not be read.");
+        
+        // Validate and return info for given user and pass
         AuthInfo info = mapping.get(username);
         if (info != null && info.validate(username, password))
             return info.getConfiguration();