From 54b5ff533e8b1f4e23514c0f70cd8a36923e2315 Mon Sep 17 00:00:00 2001
From: mindless <mindless@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 5 Mar 2009 18:28:31 +0000
Subject: [PATCH] [FIXED HUDSON-1475] tested EmailResolver code already
 present.. works for me, so added @Extension to turn it on.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16032 71c3de6d-444a-0410-be80-ed276b4c234a

Originally-Committed-As: 60473f82f6c30e5bbe36e3cca96dbdb75f69a301
---
 core/src/main/java/hudson/security/LDAPSecurityRealm.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
index f89820c..aaec57d 100644
--- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -386,14 +386,15 @@ public class LDAPSecurityRealm extends SecurityRealm {
     /**
      * If the security realm is LDAP, try to pick up e-mail address from LDAP.
      */
+    @Extension
     public static final class MailAdressResolverImpl extends MailAddressResolver {
         public String findMailAddressFor(User u) {
             // LDAP not active
-            Hudson hudson = Hudson.getInstance();
-            if(!(hudson.getSecurityRealm() instanceof LDAPSecurityRealm))
+            SecurityRealm realm = Hudson.getInstance().getSecurityRealm();
+            if(!(realm instanceof LDAPSecurityRealm))
                 return null;
             try {
-                LdapUserDetails details = (LdapUserDetails) hudson.getSecurityRealm().getSecurityComponents().userDetails.loadUserByUsername(u.getId());
+                LdapUserDetails details = (LdapUserDetails)realm.getSecurityComponents().userDetails.loadUserByUsername(u.getId());
                 Attribute mail = details.getAttributes().get("mail");
                 if(mail==null)  return null;    // not found
                 return (String)mail.get();