Refactored Proxy update notification server into its own class and

thread, so executions return before proxy messages are sent. Another
deadlock suspect.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/lookup/LDAPLookup.java b/src/main/java/com/c2kernel/lookup/LDAPLookup.java
index 116362e..eae803b 100644
--- a/src/main/java/com/c2kernel/lookup/LDAPLookup.java
+++ b/src/main/java/com/c2kernel/lookup/LDAPLookup.java
@@ -12,7 +12,6 @@ import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.TraceableEntity;

 import com.c2kernel.entity.agent.ActiveEntity;

-import com.c2kernel.entity.proxy.ProxyManager;

 import com.c2kernel.entity.proxy.ProxyMessage;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.property.PropertyDescription;

@@ -231,7 +230,7 @@ public class LDAPLookup
             LDAPEntry newEntry = new LDAPEntry(path.getFullDN(),attrSet);

             LDAPLookupUtils.addEntry(getConnection(),newEntry);

             if (path instanceof DomainPath)

-                ProxyManager.sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.ADDED));

+            	Gateway.getProxyServer().sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.ADDED));

             return newEntry;

         } catch (LDAPException ex) {

             if (ex.getResultCode() == LDAPException.ENTRY_ALREADY_EXISTS)

@@ -251,7 +250,7 @@ public class LDAPLookup
             throw new ObjectCannotBeUpdated(ex.getLDAPErrorMessage(), "");

         }

         if (path instanceof DomainPath) {

-            ProxyManager.sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.DELETED));

+        	Gateway.getProxyServer().sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.DELETED));

         }

     }