[freenet-cvs] r21271 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-07-19 21:38:53 +0000 (Sat, 19 Jul 2008)
New Revision: 21271

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Paranoia, logging

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-19 19:38:31 UTC (rev 21270)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-19 21:38:53 UTC (rev 21271)
@@ -341,9 +341,12 @@
                        if(logMINOR) Logger.minor(this, "Copying data from 
"+dataBuckets.length+" data blocks");
                        OutputStream os = decodedData.getOutputStream();
                        for(int i=0;i<dataBuckets.length;i++) {
+                               if(logMINOR) Logger.minor(this, "Copying data 
from block "+i);
                                SplitfileBlock status = dataBuckets[i];
                                if(persistent) container.activate(status, 1);
+                               if(status == null) throw new 
NullPointerException();
                                Bucket data = status.getData();
+                               if(data == null) throw new 
NullPointerException();
                                if(persistent) container.activate(data, 1);
                                BucketTools.copyTo(data, os, Long.MAX_VALUE);
                        }