diff options
| author | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
| commit | 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 (patch) | |
| tree | 5f6e5d9ae75193e67e6f3b3dfa488960c5cde1d5 /source/com/c2kernel/lookup/LDAPPathSet.java | |
| parent | 036cbdba66f804743c4c838ed598d6972c4b3e17 (diff) | |
More code cleanup:
Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class
Diffstat (limited to 'source/com/c2kernel/lookup/LDAPPathSet.java')
| -rw-r--r--[-rwxr-xr-x] | source/com/c2kernel/lookup/LDAPPathSet.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/com/c2kernel/lookup/LDAPPathSet.java b/source/com/c2kernel/lookup/LDAPPathSet.java index 9c68c5c..d3cf7d9 100755..100644 --- a/source/com/c2kernel/lookup/LDAPPathSet.java +++ b/source/com/c2kernel/lookup/LDAPPathSet.java @@ -19,35 +19,37 @@ import com.novell.ldap.LDAPSearchResults; -public class LDAPPathSet implements Enumeration {
+public class LDAPPathSet implements Enumeration<Path> {
LDAPSearchResults results;
LDAPEntry nextEntry;
-
+
public LDAPPathSet() { // empty
results = null;
}
-
+
public LDAPPathSet(LDAPSearchResults results) {
this.results = results;
}
-
- public boolean hasMoreElements() {
+
+ @Override
+ public boolean hasMoreElements() {
if (results == null) return false;
if (nextEntry != null) return true;
if (results.hasMore())
try {
nextEntry = results.next();
return true;
- } catch (LDAPException ex) {
+ } catch (LDAPException ex) {
if (ex.getResultCode()!=32) {// no results
Logger.error(ex);
Logger.error("Error loading LDAP result set: "+ex.getMessage());
}
- }
+ }
return false;
}
-
- public Object nextElement() {
+
+ @Override
+ public Path nextElement() {
if (results == null) return null;
try {
if (nextEntry == null)
|