Author: toad
Date: 2008-08-30 16:16:26 +0000 (Sat, 30 Aug 2008)
New Revision: 22253
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
indent
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-08-30 16:15:50 UTC (rev 22252)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-08-30 16:16:26 UTC (rev 22253)
@@ -1173,41 +1173,41 @@
Bucket data;
SplitFileFetcherSubSegment seg;
synchronized(this) {
- if(finished || startedDecode) {
- return false;
- }
- blockNum = this.getBlockNumber(key, container);
- if(blockNum < 0) return false;
- ClientCHK ckey = this.getBlockKey(blockNum, container);
- int retryCount = getBlockRetryCount(blockNum);
- seg = this.getSubSegment(retryCount, container, true, null);
- if(persistent)
- container.activate(seg, 1);
- if(seg != null) {
- seg.removeBlockNum(blockNum, container, false);
- seg.possiblyRemoveFromParent(container, context);
- }
- for(int i=0;i<subSegments.size();i++) {
- SplitFileFetcherSubSegment checkSeg =
(SplitFileFetcherSubSegment) subSegments.get(i);
- if(checkSeg == seg) continue;
+ if(finished || startedDecode) {
+ return false;
+ }
+ blockNum = this.getBlockNumber(key, container);
+ if(blockNum < 0) return false;
+ ClientCHK ckey = this.getBlockKey(blockNum, container);
+ int retryCount = getBlockRetryCount(blockNum);
+ seg = this.getSubSegment(retryCount, container, true,
null);
if(persistent)
- container.activate(checkSeg, 1);
- if(checkSeg.removeBlockNum(blockNum, container, false))
- Logger.error(this, "Block number "+blockNum+"
was registered to wrong subsegment "+checkSeg+" should be "+seg);
+ container.activate(seg, 1);
+ if(seg != null) {
+ seg.removeBlockNum(blockNum, container, false);
+ seg.possiblyRemoveFromParent(container,
context);
+ }
+ for(int i=0;i<subSegments.size();i++) {
+ SplitFileFetcherSubSegment checkSeg =
(SplitFileFetcherSubSegment) subSegments.get(i);
+ if(checkSeg == seg) continue;
+ if(persistent)
+ container.activate(checkSeg, 1);
+ if(checkSeg.removeBlockNum(blockNum, container,
false))
+ Logger.error(this, "Block number
"+blockNum+" was registered to wrong subsegment "+checkSeg+" should be "+seg);
+ if(persistent)
+ container.deactivate(checkSeg, 1);
+ }
if(persistent)
- container.deactivate(checkSeg, 1);
+ container.deactivate(seg, 1);
+ try {
+ cb = new ClientCHKBlock((CHKBlock)block, ckey);
+ } catch (CHKVerifyException e) {
+ this.onFatalFailure(new
FetchException(FetchException.BLOCK_DECODE_ERROR, e), blockNum, null,
container, context);
+ return false;
+ }
+ data = extract(cb, blockNum, container, context);
+ if(data == null) return false;
}
- if(persistent)
- container.deactivate(seg, 1);
- try {
- cb = new ClientCHKBlock((CHKBlock)block, ckey);
- } catch (CHKVerifyException e) {
- this.onFatalFailure(new
FetchException(FetchException.BLOCK_DECODE_ERROR, e), blockNum, null,
container, context);
- return false;
- }
- data = extract(cb, blockNum, container, context);
- if(data == null) return false;
- }
if(!cb.isMetadata()) {
this.onSuccess(data, blockNum, cb, container, context,
seg);
return true;
