Author: toad
Date: 2009-02-18 19:41:01 +0000 (Wed, 18 Feb 2009)
New Revision: 25693
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Paranoia, maybe remove if the wierd NPE doesn't come back
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-02-18 19:38:33 UTC (rev 25692)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-02-18 19:41:01 UTC (rev 25693)
@@ -1280,10 +1280,12 @@
public synchronized int getBlockNumber(Key key, ObjectContainer
container) {
for(int i=0;i<dataKeys.length;i++) {
- ClientKey k = dataKeys[i];
+ ClientCHK k = dataKeys[i];
if(k == null) continue;
if(persistent)
container.activate(k, 5);
+ if(k.getRoutingKey() == null)
+ throw new NullPointerException("Routing key is
null yet key exists for data block "+i+" of "+this);
if(k.getNodeKey().equals(key)) return i;
else {
if(persistent)
@@ -1291,10 +1293,12 @@
}
}
for(int i=0;i<checkKeys.length;i++) {
- ClientKey k = checkKeys[i];
+ ClientCHK k = checkKeys[i];
if(k == null) continue;
if(persistent)
container.activate(k, 5);
+ if(k.getRoutingKey() == null)
+ throw new NullPointerException("Routing key is
null yet key exists for check block "+i+" of "+this);
if(k.getNodeKey().equals(key)) return dataKeys.length+i;
else {
if(persistent)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
