From d4fa3bd9dd48f4d5e26850a23f5ba48a9c10ad64 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 5 Jun 2014 15:02:07 +0200 Subject: LDAP refactored behind interfaces. All functions of LDAP now hidden behind interfaces: Authenticator, Lookup and NextKeyManager (LDAP property storage was already a ClusterStorage). Gateway holds additional objects, and Fixes #26 #191. Refs #27 (needs additional work for read perms and auth tokens) --- src/main/java/com/c2kernel/utils/LocalObjectLoader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/c2kernel/utils/LocalObjectLoader.java') diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java index 307cd97..f0d8928 100644 --- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java +++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java @@ -1,6 +1,6 @@ package com.c2kernel.utils; -import java.util.Enumeration; +import java.util.Iterator; import com.c2kernel.common.InvalidDataException; import com.c2kernel.common.ObjectNotFoundException; @@ -23,10 +23,10 @@ public class LocalObjectLoader { throws ObjectNotFoundException { DomainPath defRoot = new DomainPath(root); - Enumeration e = Gateway.getLDAPLookup().search(defRoot, name); + Iterator e = Gateway.getLookup().search(defRoot, name); ItemProxy defProxy = null; int currentLayer = -1; - while (e.hasMoreElements()) { - DomainPath defPath = (DomainPath)e.nextElement(); + while (e.hasNext()) { + DomainPath defPath = (DomainPath)e.next(); ItemProxy thisProxy = Gateway.getProxyManager().getProxy(defPath); int thisLayer; try { -- cgit v1.2.3