Author: toad
Date: 2009-02-04 19:03:47 +0000 (Wed, 04 Feb 2009)
New Revision: 25549
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
More bugfixes
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 18:52:56 UTC (rev 25548)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 19:03:47 UTC (rev 25549)
@@ -1306,7 +1306,7 @@
synchronized(this) {
blockNumbers = blocks.toArray(new
Integer[blocks.size()]);
}
- ArrayList<PersistentChosenBlock> blocks = new
ArrayList<PersistentChosenBlock>();
+ ArrayList<PersistentChosenBlock> ret = new
ArrayList<PersistentChosenBlock>();
Arrays.sort(blockNumbers);
int prevBlockNumber = -1;
for(int i=0;i<blockNumbers.length;i++) {
@@ -1323,15 +1323,16 @@
fail(new
InsertException(InsertException.BUCKET_ERROR, e, null), container, context);
return null;
}
- PersistentChosenBlock block = new
PersistentChosenBlock(false, request, item, null, null, sched);
+ PersistentChosenBlock block = new
PersistentChosenBlock(true, request, item, null, null, sched);
if(logMINOR) Logger.minor(this, "Created block
"+block+" for block number "+blockNumber+" on "+this);
- blocks.add(block);
+ ret.add(block);
}
blocks.trimToSize();
if(persistent) {
container.deactivate(blocks, 1);
}
- return blocks;
+ if(logMINOR) Logger.minor(this, "Returning "+blocks.size()+"
blocks");
+ return ret;
}
@Override
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
