Morelookup

2 files changed, 8 insertions, 9 deletions

diff --git a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
index 6d2b17d..18b8ae8 100644
--- a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
+++ b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
@@ -11,7 +11,7 @@
 package com.c2kernel.entity.proxy;

 

 import java.util.Date;

-import java.util.Enumeration;

+import java.util.Iterator;

 

 import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

@@ -257,14 +257,14 @@ public class AgentProxy extends EntityProxy
 

     /** Let scripts resolve items */

     public ItemProxy searchItem(String name) throws ObjectNotFoundException {

-        Enumeration<Path> results = Gateway.getLookup().search(new DomainPath(""),name);

+        Iterator<Path> results = Gateway.getLookup().search(new DomainPath(""),name);

 

         Path returnPath = null;

-        if (!results.hasMoreElements())

+        if (!results.hasNext())

             throw new ObjectNotFoundException(name, "");

 

-        while(results.hasMoreElements()) {

-            Path nextMatch = results.nextElement();

+        while(results.hasNext()) {

+            Path nextMatch = results.next();

             if (returnPath != null && nextMatch.getSysKey() != -1 && returnPath.getSysKey() != nextMatch.getSysKey())

                 throw new ObjectNotFoundException("Too many items with that name");

             returnPath = nextMatch;

diff --git a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
index 9ed562b..994343a 100644
--- a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
@@ -12,7 +12,6 @@ package com.c2kernel.entity.proxy;
 

 import java.util.ArrayList;

 import java.util.ConcurrentModificationException;

-import java.util.Enumeration;

 import java.util.HashMap;

 import java.util.Iterator;

 

@@ -47,9 +46,9 @@ public class EntityProxyManager
     {

         Logger.msg(5, "EntityProxyManager - Starting.....");

 

-        Enumeration<Path> servers = Gateway.getLookup().searchEntities(new DomainPath("/servers"));

-        while(servers.hasMoreElements()) {

-            Path thisServerPath = servers.nextElement();

+        Iterator<Path> servers = Gateway.getLookup().searchEntities(new DomainPath("/servers"));

+        while(servers.hasNext()) {

+            Path thisServerPath = servers.next();

             try {

                 int syskey = thisServerPath.getSysKey();

                 String remoteServer = ((Property)Gateway.getStorage().get(syskey, ClusterStorage.PROPERTY+"/Name", null)).getValue();