1 files changed, 7 insertions, 13 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 305128b..3c4a6a7 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -13,16 +13,14 @@ package com.c2kernel.lifecycle.instance.predefined;
 
 
 
-import java.util.Enumeration;
+import java.util.Iterator;
 
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.EntityPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.Path;
-import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
 import com.c2kernel.utils.Logger;
 
 
@@ -48,24 +46,20 @@ public class Erase extends PredefinedStep
 
         try
         {
-            // FIXME: This should search for the entity key. Name shouldn't be unique.
-            // find entity name
-            Property name = (Property)Gateway.getStorage().get(itemSysKey, ClusterStorage.PROPERTY+"/Name", null);
-
             // get all domain paths
-            Enumeration<Path> domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());
-            while (domPaths.hasMoreElements()) {
-                DomainPath path = (DomainPath)domPaths.nextElement();
+            Iterator<Path> domPaths = Gateway.getLookup().searchAliases(new ItemPath(itemSysKey));
+            while (domPaths.hasNext()) {
+                DomainPath path = (DomainPath)domPaths.next();
                 // delete them
                 if (path.getSysKey() == itemSysKey)
-                    Gateway.getLDAPLookup().delete(path);
+                    Gateway.getLookup().delete(path);
             }
 
             //clear out all storages
             Gateway.getStorage().removeCluster(itemSysKey, "", null);
 
             //remove entity path
-            Gateway.getLDAPLookup().delete(new EntityPath(itemSysKey));
+            Gateway.getLookup().delete(new ItemPath(itemSysKey));
         }
         catch( Exception ex )
         {