fix for "no more elements available" exception

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4901 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 17 years ago
parent 9e7c60f227
commit 9a9737a54e

@ -353,17 +353,27 @@ public class kelondroMapObjects extends kelondroObjects {
Iterator<String> keyIterator; Iterator<String> keyIterator;
boolean finish; boolean finish;
HashMap<String, String> n;
public mapIterator(Iterator<String> keyIterator) { public mapIterator(Iterator<String> keyIterator) {
this.keyIterator = keyIterator; this.keyIterator = keyIterator;
this.finish = false; this.finish = false;
this.n = next0();
} }
public boolean hasNext() { public boolean hasNext() {
return (!(finish)) && (keyIterator != null) && (keyIterator.hasNext()); return this.n != null;
} }
public HashMap<String, String> next() { public HashMap<String, String> next() {
HashMap<String, String> n1 = n;
n = next0();
return n1;
}
private HashMap<String, String> next0() {
if (finish) return null;
if (keyIterator == null) return null;
String nextKey; String nextKey;
HashMap<String, String> map; HashMap<String, String> map;
while (keyIterator.hasNext()) { while (keyIterator.hasNext()) {
@ -377,7 +387,7 @@ public class kelondroMapObjects extends kelondroObjects {
map.put("key", nextKey); map.put("key", nextKey);
return map; return map;
} }
throw new kelondroException("no more elements available"); return null;
} }
public void remove() { public void remove() {

Loading…
Cancel
Save