echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix NPE after corruption ticket #515

Browse Source
This commit is contained in:
zzz
2011-08-24 18:03:56 +00:00
parent f6d2ac7fb2
commit 546b668502
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/src/net/metanotion/io/block/index/IBSkipSpan.java
View File

@ -283,7 +283,8 @@ public class IBSkipSpan extends BSkipSpan {
BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
bss.loadFirstKey();
Comparable nextFirstKey = bss.firstKey;
if (previousFirstKey.compareTo(nextFirstKey) >= 0) {
if (previousFirstKey == null || nextFirstKey == null ||
previousFirstKey.compareTo(nextFirstKey) >= 0) {
// TODO remove, but if we are at the bottom of a level
// we have to remove the level too, which is a mess
BlockFile.log.error("Corrupt database, span out of order " + ((BSkipSpan)bss.prev).page +
@ -312,7 +313,8 @@ public class IBSkipSpan extends BSkipSpan {
BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
bss.loadFirstKey();
Comparable previousFirstKey = bss.firstKey;
if (previousFirstKey.compareTo(nextFirstKey) >= 0) {
if (previousFirstKey == null || nextFirstKey == null ||
previousFirstKey.compareTo(nextFirstKey) >= 0) {
// TODO remove, but if we are at the bottom of a level
// we have to remove the level too, which is a mess
BlockFile.log.error("Corrupt database, span out of order " + bss.page +