fixed a possible race condition (INFRADNA-65)

a9efb3da · Kohsuke Kawaguchi · 12ab4050 · a9efb3da
隐藏空白更改
内联并排

Showing with 5 addition and 3 deletion

core/src/main/java/hudson/security/LDAPSecurityRealm.java core/src/main/java/hudson/security/LDAPSecurityRealm.java +5 -3

未找到文件。
--- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -436,9 +436,11 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
                    // intern attributes
                    Attributes v = ldapUser.getAttributes();
                    if (v instanceof BasicAttributes) {// BasicAttributes.equals is what makes the interning possible
-                        Attributes vv = (Attributes)attributesCache.get(v);
-                        if (vv==null)   attributesCache.put(v,vv=v);
-                        user.setAttributes(vv);
+                        synchronized (attributesCache) {
+                            Attributes vv = (Attributes)attributesCache.get(v);
+                            if (vv==null)   attributesCache.put(v,vv=v);
+                            user.setAttributes(vv);
+                        }
                    }

                    GrantedAuthority[] extraAuthorities = authoritiesPopulator.getGrantedAuthorities(ldapUser);