Author: toad
Date: 2007-02-14 17:38:30 +0000 (Wed, 14 Feb 2007)
New Revision: 11781
Modified:
trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
Log:
Throw an appropriate exception instead of an NPE if blocks are null in
SplitFileFetcher init.
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2007-02-14 01:08:09 UTC (rev 11780)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2007-02-14 17:38:30 UTC (rev 11781)
@@ -81,9 +81,9 @@
splitfileDataBlocks = metadata.getSplitfileDataKeys();
splitfileCheckBlocks = metadata.getSplitfileCheckKeys();
for(int i=0;i<splitfileDataBlocks.length;i++)
- if(splitfileDataBlocks[i] == null) throw new
NullPointerException("Null: data block "+i+" of "+splitfileDataBlocks.length);
+ if(splitfileDataBlocks[i] == null) throw new
MetadataParseException("Null: data block "+i+" of "+splitfileDataBlocks.length);
for(int i=0;i<splitfileCheckBlocks.length;i++)
- if(splitfileCheckBlocks[i] == null) throw new
NullPointerException("Null: check block "+i+" of "+splitfileCheckBlocks.length);
+ if(splitfileCheckBlocks[i] == null) throw new
MetadataParseException("Null: check block "+i+" of
"+splitfileCheckBlocks.length);
long finalLength = splitfileDataBlocks.length *
CHKBlock.DATA_LENGTH;
if(finalLength > overrideLength) {
if(finalLength - overrideLength > CHKBlock.DATA_LENGTH)
