2 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java b/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java
index 16ac7a0..8e35fae 100644
--- a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java
@@ -6,6 +6,7 @@ import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.lookup.InvalidEntityPathException;
+import com.c2kernel.lookup.LDAPLookup;
 import com.c2kernel.lookup.LDAPPropertyManager;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.property.Property;
@@ -16,8 +17,10 @@ public class LDAPClusterStorage extends ClusterStorage {
 
     @Override
 	public void open() throws ClusterStorageException {
-	    ldapStore = Gateway.getLDAPLookup().getPropManager();
-
+    	if (Gateway.getLookup() instanceof LDAPLookup)
+    		ldapStore = ((LDAPLookup)Gateway.getLookup()).getPropManager();
+    	else
+    		throw new ClusterStorageException("Can't use LDAP storage when not using LDAP lookup.");
     }
 
     @Override
diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
index e93c1ff..69847ca 100644
--- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java
+++ b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
@@ -7,7 +7,7 @@ import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.entity.ItemHelper;
 import com.c2kernel.entity.ManageableEntity;
 import com.c2kernel.lookup.EntityPath;
-import com.c2kernel.lookup.LDAPLookup;
+import com.c2kernel.lookup.Lookup;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Logger;
@@ -18,11 +18,11 @@ import com.c2kernel.utils.Logger;
 
 public class ProxyLoader extends ClusterStorage {
     HashMap<Integer, ManageableEntity> entities = new HashMap<Integer, ManageableEntity>();
-    LDAPLookup lookup;
+    Lookup lookup;
 
     @Override
 	public void open() throws ClusterStorageException {
-        lookup = Gateway.getLDAPLookup();
+        lookup = Gateway.getLookup();
     }
 
     @Override
@@ -109,7 +109,7 @@ public class ProxyLoader extends ClusterStorage {
         try {
             Logger.msg(7, "ProxyLoader.getIOR() - Resolving "+sysKey+".");
 
-            org.omg.CORBA.Object ior = lookup.getIOR(new EntityPath(sysKey.intValue()));
+            org.omg.CORBA.Object ior = lookup.resolve(new EntityPath(sysKey.intValue()));
 
             ManageableEntity thisEntity = null;
             try {