boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fixed (again) nullPointerException in kelondroTree

Browse Source 
see: http://www.yacy-forum.de/viewtopic.php?p=17091#17091

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1656 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 19 years ago
parent 4ceea34187
commit ba5fe0b287
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File

64
source/de/anomic/kelondro/kelondroTree.java
Unescape View File

@ -265,45 +265,39 @@ public class kelondroTree extends kelondroRecords implements kelondroIndex {
throw new kelondroException(filename, "kelondroTree.Search.process: thenode==null");
}
k = thenode.getKey();
if ((k != null) && (visitedNodeKeys.contains(k))) {
// we have loops in the database.
// to fix this, all affected nodes must be patched
thenode.setOHByte(magic, (byte) 1);
thenode.setOHByte(balance, (byte) 0);
thenode.setOHHandle(parent, null);
thenode.setOHHandle(leftchild, null);
thenode.setOHHandle(rightchild, null);
thenode.commit(CP_NONE);
/*
* Iterator fix = visitedNodeKeys.entrySet().iterator();
* Map.Entry entry; while (fix.hasNext()) { entry =
* (Map.Entry) fix.next(); thenode = (Node)
* entry.getValue(); thenode.setOHByte(magic, (byte) 1);
* thenode.setOHByte(balance, (byte) 0);
* thenode.setOHHandle(parent, null);
* thenode.setOHHandle(leftchild, null);
* thenode.setOHHandle(rightchild, null); }
*/
logWarning("kelondroTree.Search.process: database contains loops; the loop-nodes have been auto-fixed");
if (k == null) {
found = false;
return;
}
// System.out.println("Comparing key = '" + new String(key)
// + "' with '" + otherkey + "':"); // debug
c = objectOrder.compare(key, thenode.getKey());
// System.out.println(c); // debug
if (c == 0) {
found = true;
// System.out.println("DEBUG: search for " + new String(key) + " ended with status=" + ((found) ? "found" : "not-found") + ", node=" + ((thenode == null) ? "NULL" : thenode.toString()) + ", parent=" + ((parentnode == null) ? "NULL" : parentnode.toString()));
return;
} else if (c < 0) {
child = -1;
thisHandle = thenode.getOHHandle(leftchild);
} else {
child = 1;
thisHandle = thenode.getOHHandle(rightchild);
if (visitedNodeKeys.contains(k)) {
// we have loops in the database.
// to fix this, all affected nodes must be patched
thenode.setOHByte(magic, (byte) 1);
thenode.setOHByte(balance, (byte) 0);
thenode.setOHHandle(parent, null);
thenode.setOHHandle(leftchild, null);
thenode.setOHHandle(rightchild, null);
thenode.commit(CP_NONE);
logWarning("kelondroTree.Search.process: database contains loops; the loop-nodes have been auto-fixed");
found = false;
return;
}
// System.out.println("Comparing key = '" + new String(key) + "' with '" + otherkey + "':"); // debug
c = objectOrder.compare(key, k);
// System.out.println(c); // debug
if (c == 0) {
found = true;
// System.out.println("DEBUG: search for " + new String(key) + " ended with status=" + ((found) ? "found" : "not-found") + ", node=" + ((thenode == null) ? "NULL" : thenode.toString()) + ", parent=" + ((parentnode == null) ? "NULL" : parentnode.toString()));
return;
} else if (c < 0) {
child = -1;
thisHandle = thenode.getOHHandle(leftchild);
} else {
child = 1;
thisHandle = thenode.getOHHandle(rightchild);
}
visitedNodeKeys.add(k);
}
visitedNodeKeys.add(thenode.getKey());
}
}
// System.out.println("DEBUG: search for " + new String(key) + "

Write Preview
Loading…
Cancel
Save