From 3168485452bc894299ec986daf6ca22ab848f886 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 20 Feb 2014 14:44:43 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)   
 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
---
 .../repo/security/sync/ldap/LDAPUserRegistry.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
index b8041d4261..64b122cdc6 100644
--- a/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
+++ b/source/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
@@ -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)
                 {