diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-02-27 21:36:23 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-03-18 14:03:54 +0100 |
| commit | c6204281c819ea4514952ed7623e282babcb5f8c (patch) | |
| tree | c15b27b53f1967b062f219c401f28d46e5fdd654 /src/main/java/com/c2kernel/process | |
| parent | 6e35118970c7af70eb0ac938859d794f7348d367 (diff) | |
Morelookup
Diffstat (limited to 'src/main/java/com/c2kernel/process')
| -rw-r--r-- | src/main/java/com/c2kernel/process/Bootstrap.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/Gateway.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index b4e192c..c9e1433 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -1,7 +1,7 @@ package com.c2kernel.process;
import java.net.InetAddress;
-import java.util.Enumeration;
+import java.util.Iterator;
import java.util.StringTokenizer;
import org.custommonkey.xmlunit.Diff;
@@ -114,16 +114,16 @@ public class Bootstrap public static void verifyResource(String ns, String itemName, String itemType, String data) throws Exception {
Logger.msg(1, "Bootstrap.verifyResource() - Verifying data of "+getDataType(itemType)+" "+itemName);
- Enumeration<Path> en = Gateway.getLookup().search(getTypeRoot(itemType), itemName);
+ Iterator<Path> en = Gateway.getLookup().search(getTypeRoot(itemType), itemName);
ItemProxy thisProxy;
Outcome newOutcome = new Outcome(0, data, getDataType(itemType), 0);
- if (!en.hasMoreElements()) {
+ if (!en.hasNext()) {
Logger.msg("Bootstrap.verifyResource() - "+getDataType(itemType)+" "+itemName+" not found. Creating new.");
thisProxy = createResourceItem(itemType, itemName, ns);
}
else {
- DomainPath path = (DomainPath)en.nextElement();
+ DomainPath path = (DomainPath)en.next();
thisProxy = (ItemProxy)Gateway.getProxyManager().getProxy(path);
try {
Viewpoint currentData = (Viewpoint)thisProxy.getObject(ClusterStorage.VIEWPOINT+"/"+getDataType(itemType)+"/last");
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index afdff12..0b9665e 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -351,7 +351,7 @@ public class Gateway // disconnect from ldap
if (mLookup != null)
- mLookup.disconnect();
+ mLookup.close();
mLookup = null;
// shut down proxy manager
|