Author: toad
Date: 2009-04-15 22:32:48 +0000 (Wed, 15 Apr 2009)
New Revision: 26860
Modified:
trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
indent
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-04-15 22:31:48 UTC (rev 26859)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-04-15 22:32:48 UTC (rev 26860)
@@ -1498,23 +1498,23 @@
fatal = new
FetchException(FetchException.BLOCK_DECODE_ERROR, e);
}
if(cb != null) {
- data = extract(cb, blockNum, container, context);
- if(data == null) {
- if(logMINOR)
- Logger.minor(this, "Extract failed");
- return false;
- } else {
- // This can be done safely inside the lock.
- if(parent instanceof ClientGetter)
- ((ClientGetter)parent).addKeyToBinaryBlob(cb,
container, context);
- if(!cb.isMetadata()) {
- // We MUST remove the keys before we exit the
synchronized block,
- // thus ensuring that the next call will return
FALSE, and the keys
- // will only be removed from the Bloom filter
ONCE!
- onSuccessResult = onSuccessInner(data,
blockNum, cb, container, context, seg);
+ data = extract(cb, blockNum, container,
context);
+ if(data == null) {
+ if(logMINOR)
+ Logger.minor(this, "Extract
failed");
+ return false;
+ } else {
+ // This can be done safely inside the
lock.
+ if(parent instanceof ClientGetter)
+
((ClientGetter)parent).addKeyToBinaryBlob(cb, container, context);
+ if(!cb.isMetadata()) {
+ // We MUST remove the keys
before we exit the synchronized block,
+ // thus ensuring that the next
call will return FALSE, and the keys
+ // will only be removed from
the Bloom filter ONCE!
+ onSuccessResult =
onSuccessInner(data, blockNum, cb, container, context, seg);
+ }
+ }
}
- }
- }
}
if(killSeg)
seg.kill(container, context, true, true);
@@ -1524,15 +1524,15 @@
} else if(data == null) {
return false; // Extract failed
} else { // cb != null
- if(!cb.isMetadata()) {
- if(onSuccessResult != (short) -1)
- finishOnSuccess(onSuccessResult, container,
context);
- return true;
- } else {
- onFatalFailure(new
FetchException(FetchException.INVALID_METADATA, "Metadata where expected
data"), blockNum, null, container, context);
- return true;
+ if(!cb.isMetadata()) {
+ if(onSuccessResult != (short) -1)
+ finishOnSuccess(onSuccessResult,
container, context);
+ return true;
+ } else {
+ onFatalFailure(new
FetchException(FetchException.INVALID_METADATA, "Metadata where expected
data"), blockNum, null, container, context);
+ return true;
+ }
}
- }
}
private int getBlockRetryCount(int blockNum) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
