inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

Browse Source 
62929: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62598: ACE-579 - Synchronization aborted due to error java.lang.NullPointerException


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:44:43 +00:00
parent 149492e25c
commit 3168485452
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
View File

@@ -1271,7 +1271,11 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
callback.process(result);
// Close the contexts, see ALF-20682
((Context)result.getObject()).close();
Context resultCtx = (Context)result.getObject();
if(resultCtx != null)
{
resultCtx.close();
}
result = null;
}
}
@@ -1293,7 +1297,11 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
{
try
{
((Context)result.getObject()).close();
Context resultCtx = (Context)result.getObject();
if(resultCtx != null)
{
resultCtx.close();
}
}
catch (Exception e)
{