From 34de0b53586ee5da0331b4ed620e6bdd4036a8a1 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Fri, 23 May 2014 14:10:30 +0100
Subject: [PATCH] Fix NPE

---
 .../ldap/FromUserRecordLDAPGroupMembershipStrategy.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/security/plugins/ldap/FromUserRecordLDAPGroupMembershipStrategy.java b/src/main/java/jenkins/security/plugins/ldap/FromUserRecordLDAPGroupMembershipStrategy.java
index fcdc899..d894b95 100644
--- a/src/main/java/jenkins/security/plugins/ldap/FromUserRecordLDAPGroupMembershipStrategy.java
+++ b/src/main/java/jenkins/security/plugins/ldap/FromUserRecordLDAPGroupMembershipStrategy.java
@@ -32,6 +32,7 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import javax.naming.InvalidNameException;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,7 +62,8 @@ public class FromUserRecordLDAPGroupMembershipStrategy extends LDAPGroupMembersh
     @Override
     public GrantedAuthority[] getGrantedAuthorities(LdapUserDetails ldapUser) {
         List<GrantedAuthority> result = new ArrayList<GrantedAuthority>();
-        Attribute attribute = ldapUser.getAttributes().get(attributeName);
+        Attributes attributes = ldapUser.getAttributes();
+        Attribute attribute = attributes == null ? null : attributes.get(attributeName);
         if (attribute != null) {
             try {
                 for (Object value: Collections.list(attribute.getAll())) {