Author: toad
Date: 2008-09-26 20:51:26 +0000 (Fri, 26 Sep 2008)
New Revision: 22854
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
branches/db4o/freenet/src/freenet/node/SendableRequest.java
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
branches/db4o/freenet/src/freenet/support/SectoredRandomGrabArray.java
branches/db4o/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
branches/db4o/freenet/src/freenet/support/SortedVectorByNumber.java
branches/db4o/freenet/src/freenet/support/io/ArrayBucket.java
branches/db4o/freenet/src/freenet/support/io/BucketChainBucket.java
branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
branches/db4o/freenet/src/freenet/support/io/FileBucket.java
branches/db4o/freenet/src/freenet/support/io/MultiReaderBucket.java
branches/db4o/freenet/src/freenet/support/io/NullBucket.java
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
branches/db4o/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
branches/db4o/freenet/src/freenet/support/io/TempBucketFactory.java
branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
Log:
Argh!
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -339,7 +339,6 @@
insertedAllFiles = true;
if(persistent())
container.store(this);
- container.store(this);
gotAllMetadata(container, context);
}
} catch (InsertException e) {
@@ -548,9 +547,7 @@
metadataInserter.start(null, container, context);
if(persistent()) {
container.store(metadataPuttersByMetadata);
- container.store(metadataPuttersByMetadata);
container.store(metadataPuttersUnfetchable);
- container.store(metadataPuttersUnfetchable);
}
} catch (InsertException e) {
fail(e, container);
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -140,7 +140,6 @@
cb.onEncode(block.getClientKey(), this, container,
context);
if(shouldSend && persistent)
container.store(this);
- container.store(this);
if(persistent && !calledByCB)
container.deactivate(cb, 1);
return block;
@@ -203,7 +202,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
getScheduler(context).registerInsert(this, persistent, false,
true, container);
}
@@ -218,7 +216,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(e.isFatal() || forceFatal)
parent.fatallyFailedBlock(container, context);
else
@@ -235,7 +232,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
return encode(container, context, calledByCB);
} catch (InsertException e) {
if(persistent)
@@ -273,7 +269,6 @@
finished = true;
if(persistent)
container.store(this);
- container.store(this);
} else {
getScheduler(context).registerInsert(this, persistent,
true, true, container);
}
@@ -319,7 +314,6 @@
if(persistent) {
container.activate(cb, 1);
container.store(this);
- container.store(this);
}
parent.completedBlock(false, container, context);
cb.onSuccess(this, container, context);
@@ -336,7 +330,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.activate(cb, 1);
}
super.unregister(container, context);
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -172,7 +172,6 @@
metadata = Metadata.construct(data);
if(persistent)
container.store(this);
- container.store(this);
} catch (MetadataParseException e) {
onFailure(new FetchException(e), false,
container, context);
return;
@@ -221,9 +220,7 @@
result = new FetchResult(result, data);
if(persistent) {
container.store(this);
- container.store(this);
container.store(decompressors);
- container.store(decompressors);
}
}
if((!ctx.ignoreTooManyPathComponents) &&
(!metaStrings.isEmpty()) && isFinal) {
@@ -292,9 +289,7 @@
metadata =
metadata.getDefaultDocument();
if(persistent) {
container.store(this);
- container.store(this);
container.store(metaStrings);
- container.store(metaStrings);
}
if(metadata == null)
throw new
FetchException(FetchException.NOT_ENOUGH_PATH_COMPONENTS, -1, false, null,
uri.addMetaStrings(new String[] { "" }));
@@ -303,11 +298,8 @@
thisKey = thisKey.pushMetaString(name);
if(persistent) {
container.store(this);
- container.store(this);
container.store(metaStrings);
- container.store(metaStrings);
container.store(thisKey);
- container.store(thisKey);
}
if(metadata == null)
throw new
FetchException(FetchException.NOT_IN_ARCHIVE);
@@ -319,7 +311,6 @@
// Just return the archive, whole.
metadata.setSimpleRedirect();
if(persistent)
container.store(metadata);
- if(persistent)
container.store(metadata);
continue;
}
// First we need the archive metadata.
@@ -341,7 +332,6 @@
throw new
FetchException(FetchException.BUCKET_ERROR, e);
}
if(persistent) container.store(this);
- if(persistent) container.store(this);
} else {
final boolean persistent =
this.persistent;
fetchArchive(false, archiveMetadata,
ArchiveManager.METADATA_NAME, new ArchiveExtractCallback() {
@@ -386,7 +376,6 @@
}
}, container, context); // will result
in this function being called again
if(persistent) container.store(this);
- if(persistent) container.store(this);
return;
}
continue;
@@ -394,7 +383,6 @@
if(logMINOR) Logger.minor(this, "Is
archive-internal redirect");
clientMetadata.mergeNoOverwrite(metadata.getClientMetadata());
if(persistent) container.store(clientMetadata);
- if(persistent) container.store(clientMetadata);
String mime = clientMetadata.getMIMEType();
if(mime != null) rcb.onExpectedMIME(mime,
container);
if(metaStrings.isEmpty() && isFinal &&
clientMetadata.getMIMETypeNoParams() != null && ctx.allowedMIMETypes != null &&
@@ -491,9 +479,7 @@
// Clear our own metadata so it can be garbage
collected, it will be replaced by whatever is fetched.
this.metadata = null;
if(persistent) container.store(this);
- if(persistent) container.store(this);
if(persistent) container.store(f);
- if(persistent) container.store(f);
f.wrapHandleMetadata(true, container, context);
if(persistent) container.deactivate(f, 1);
return;
@@ -501,7 +487,6 @@
if(logMINOR) Logger.minor(this, "Is single-file
redirect");
clientMetadata.mergeNoOverwrite(metadata.getClientMetadata()); // even
splitfiles can have mime types!
if(persistent) container.store(clientMetadata);
- if(persistent) container.store(clientMetadata);
String mime = clientMetadata.getMIMEType();
if(mime != null) rcb.onExpectedMIME(mime,
container);
@@ -510,11 +495,9 @@
// Looks like an implicit archive,
handle as such
metadata.setArchiveManifest();
if(persistent)
container.store(metadata);
- if(persistent)
container.store(metadata);
// Pick up MIME type from inside archive
clientMetadata.clear();
if(persistent)
container.store(clientMetadata);
- if(persistent)
container.store(clientMetadata);
if(logMINOR) Logger.minor(this,
"Handling implicit container... (redirect)");
continue;
}
@@ -562,11 +545,8 @@
parent.onTransition(this, f, container);
if(persistent) {
container.store(metaStrings);
- container.store(metaStrings);
container.store(f); // Store *before*
scheduling to avoid activation problems.
- container.store(f); // Store *before*
scheduling to avoid activation problems.
container.store(this);
- container.store(this);
}
f.schedule(container, context);
// All done! No longer our problem!
@@ -577,7 +557,6 @@
clientMetadata.mergeNoOverwrite(metadata.getClientMetadata()); // even
splitfiles can have mime types!
if(persistent) container.store(clientMetadata);
- if(persistent) container.store(clientMetadata);
String mime = clientMetadata.getMIMEType();
if(mime != null) rcb.onExpectedMIME(mime,
container);
@@ -589,9 +568,7 @@
clientMetadata.clear();
if(persistent) {
container.store(metadata);
- container.store(metadata);
container.store(clientMetadata);
- container.store(clientMetadata);
}
if(logMINOR) Logger.minor(this,
"Handling implicit container... (splitfile)");
continue;
@@ -612,7 +589,6 @@
addDecompressor(codec);
if(persistent)
container.store(decompressors);
- container.store(decompressors);
}
if(isFinal && !ctx.ignoreTooManyPathComponents)
{
@@ -654,7 +630,6 @@
decompressors, clientMetadata,
actx, recursionLevel, returnBucket, token, container, context);
if(persistent)
container.store(sf); // Avoid problems
caused by storing a deactivated sf
- container.store(sf); // Avoid problems
caused by storing a deactivated sf
parent.onTransition(this, sf, container);
try {
sf.schedule(container, context);
@@ -673,7 +648,6 @@
// Then it will return data to rcd.
// We are now out of the loop. Yay!
if(persistent) container.store(this);
- if(persistent) container.store(this);
return;
} else {
Logger.error(this, "Don't know what to do with
metadata: "+metadata);
@@ -707,7 +681,6 @@
final SingleFileFetcher f;
f = new SingleFileFetcher(this, newMeta, new
ArchiveFetcherCallback(forData, element, callback), new FetchContext(ctx,
FetchContext.SET_RETURN_ARCHIVES, true), container, context);
if(persistent) container.store(f);
- if(persistent) container.store(f);
if(logMINOR) Logger.minor(this, "fetchArchive(): "+f);
// Fetch the archive. The archive fetcher callback will unpack
it, and either call the element
// callback, or just go back around handleMetadata() on this,
which will see that the data is now
@@ -874,7 +847,6 @@
}
if(persistent)
container.store(SingleFileFetcher.this);
- container.store(SingleFileFetcher.this);
wrapHandleMetadata(true, container, context);
} catch (MetadataParseException e) {
SingleFileFetcher.this.onFailure(new
FetchException(FetchException.INVALID_METADATA, e), false, container, context);
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -209,7 +209,6 @@
started = true;
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(cb, 1);
container.deactivate(parent, 1);
}
@@ -256,7 +255,6 @@
started = true;
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(cb, 1);
container.deactivate(parent, 1);
}
@@ -278,7 +276,6 @@
sh.sfi = sfi;
if(persistent)
container.store(sh);
- container.store(sh);
cb.onTransition(this, sh, container);
sfi.start(container, context);
if(earlyEncode) sfi.forceEncode(container, context);
@@ -286,7 +283,6 @@
started = true;
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(cb, 1);
container.deactivate(parent, 1);
}
@@ -426,7 +422,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
}
public SplitHandler() {
@@ -444,7 +439,6 @@
metadataPutter = newState;
if(persistent)
container.store(this);
- container.store(this);
}
public void onSuccess(ClientPutState state, ObjectContainer
container, ClientContext context) {
@@ -460,7 +454,6 @@
block.free(container);
if(persistent)
container.store(this);
- container.store(this);
}
return;
}
@@ -485,7 +478,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(lateStart)
startMetadata(container, context);
else if(finished) {
@@ -539,7 +531,6 @@
if(reportMetadataOnly) {
if(persistent)
container.store(this);
- container.store(this);
cb.onMetadata(meta, this, container, context);
return;
}
@@ -600,7 +591,6 @@
Logger.minor(this, "Created
metadata putter for "+this+" : "+metadataPutter+" bucket "+metadataBucket+"
size "+metadataBucket.size());
if(persistent)
container.store(this);
- container.store(this);
if(!(earlyEncode ||
splitInsertSuccess)) return;
}
if(logMINOR) Logger.minor(this, "Putting
metadata on "+metadataPutter+" from "+sfi+"
("+((SplitFileInserter)sfi).getLength()+ ')');
@@ -638,7 +628,6 @@
cb.onFailure(e, this, container, context);
if(persistent)
container.store(this);
- container.store(this);
}
public BaseClientPutter getParent() {
@@ -665,7 +654,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
if(oldSFI != null)
container.activate(oldSFI, 1);
if(oldMetadataPutter != null)
@@ -691,7 +679,6 @@
metaInsertSetBlocks = true;
if(persistent)
container.store(this);
- container.store(this);
if(!(splitInsertSetBlocks &&
metaInsertSetBlocks))
return;
}
@@ -748,7 +735,6 @@
metaFetchable = true;
if(persistent)
container.store(this);
- container.store(this);
} else {
if(state != sfi) {
Logger.error(this, "onFetchable
for unknown state "+state);
@@ -756,7 +742,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(logMINOR) Logger.minor(this, "Data
fetchable");
if(metaInsertStarted) return;
}
@@ -788,7 +773,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(putter != null) {
if(logMINOR) Logger.minor(this,
"Starting metadata inserter: "+putter+" for "+this);
putter.schedule(container, context);
@@ -823,7 +807,6 @@
block.free(container);
if(persistent)
container.store(this);
- container.store(this);
}
public void schedule(ObjectContainer container, ClientContext context)
throws InsertException {
Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -256,7 +256,6 @@
if(persistent)
container.store(this);
- container.store(this);
if(segmentCount == 1) {
// splitfile* will be overwritten, this is bad
@@ -278,7 +277,6 @@
}
if(persistent) {
container.store(segments[0]);
- container.store(segments[0]);
segments[0].deactivateKeys(container);
container.deactivate(segments[0], 1);
}
@@ -303,7 +301,6 @@
tempListener.addKey(checkBlocks[j].getNodeKey(), i, context);
if(persistent) {
container.store(segments[i]);
- container.store(segments[i]);
segments[i].deactivateKeys(container);
container.deactivate(segments[i], 1);
for(int
x=dataBlocksPtr;x<dataBlocksPtr+copyDataBlocks;x++)
@@ -426,7 +423,6 @@
notifyAll();
}
if(persistent) container.store(this);
- if(persistent) container.store(this);
if(finish) finish(container, context);
}
@@ -449,7 +445,6 @@
// Decompress
if(persistent) {
container.store(this);
- container.store(this);
container.activate(decompressors, 5);
container.activate(returnBucket, 5);
cbWasActive = container.ext().isActive(cb);
@@ -577,7 +572,6 @@
mainBloomFile =
context.fg.makeRandomFile();
altBloomFile =
context.fg.makeRandomFile();
container.store(this);
- container.store(this);
} catch (IOException e1) {
throw new
KeyListenerConstructionException(new
FetchException(FetchException.BUCKET_ERROR, "Unable to create Bloom filter
files in reconstruction", e1));
}
@@ -609,7 +603,6 @@
this.keyCount = keyCount2;
if(persistent)
container.store(this);
- container.store(this);
}
public void onFailed(KeyListenerConstructionException e,
ObjectContainer container, ClientContext context) {
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -240,7 +240,6 @@
dataBuckets[blockNo].setData(data);
if(persistent)
container.store(dataBuckets[blockNo]);
- container.store(dataBuckets[blockNo]);
} else if(blockNo < checkKeys.length + dataKeys.length)
{
blockNo -= dataKeys.length;
if(checkKeys[blockNo] == null) {
@@ -258,7 +257,6 @@
checkBuckets[blockNo].setData(data);
if(persistent)
container.store(checkBuckets[blockNo]);
- container.store(checkBuckets[blockNo]);
} else
Logger.error(this, "Unrecognized block number:
"+blockNo, new Exception("error"));
if(startedDecode) {
@@ -276,7 +274,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.activate(parent, 1);
}
parent.completedBlock(dontNotify, container, context);
@@ -304,7 +301,6 @@
codec = FECCodec.getCodec(splitfileType, dataKeys.length,
checkKeys.length, context.mainExecutor);
if(persistent)
container.store(this);
- container.store(this);
// Activate buckets
if(persistent) {
@@ -362,7 +358,6 @@
// The FECCodec won't set them.
// But they should be active.
container.store(dataBuckets[i]);
- container.store(dataBuckets[i]);
}
}
if(isCollectingBinaryBlob(parent)) {
@@ -399,7 +394,6 @@
if(codec == null || !isCollectingBinaryBlob(parent))
parentFetcher.segmentFinished(SplitFileFetcherSegment.this, container, context);
if(persistent) container.store(this);
- if(persistent) container.store(this);
// Leave active before queueing
} catch (IOException e) {
Logger.normal(this, "Caught bucket error?: "+e, e);
@@ -408,7 +402,6 @@
failureException = new
FetchException(FetchException.BUCKET_ERROR);
}
if(persistent) container.store(this);
- if(persistent) container.store(this);
parentFetcher.segmentFinished(SplitFileFetcherSegment.this, container, context);
return;
}
@@ -501,7 +494,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
}
// Defer the completion until we have generated healing blocks
if we are collecting binary blobs.
if(isCollectingBinaryBlob(parent)) {
@@ -585,7 +577,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(allFailed)
fail(new FetchException(FetchException.SPLITFILE_ERROR,
errors), container, context, false);
else if(seg != null)
@@ -704,7 +695,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(key, 5);
}
if(mustSchedule)
@@ -743,7 +733,6 @@
}
if(persistent)
container.store(subSegments);
- container.store(subSegments);
return sub;
}
@@ -780,7 +769,6 @@
removeSubSegments(container, context);
if(persistent) {
container.store(this);
- container.store(this);
container.activate(parentFetcher, 1);
}
parentFetcher.removeMyPendingKeys(this, container, context);
@@ -807,7 +795,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if(persistent)
container.deactivate(seg, 1);
return seg;
@@ -885,7 +872,6 @@
}
if(persistent)
container.store(subSegments);
- container.store(subSegments);
return true;
}
@@ -899,7 +885,6 @@
}
if(persistent && deadSegs.length > 0)
container.store(this);
- container.store(this);
for(int i=0;i<deadSegs.length;i++) {
if(persistent)
container.activate(deadSegs[i], 1);
@@ -910,9 +895,7 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.store(subSegments);
- container.store(subSegments);
}
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-09-26 19:23:40 UTC (rev 22853)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -187,7 +187,6 @@
Logger.minor(this, "Removing block
"+x+" of "+(blockNums.size()+1)+ " : "+ret+ " on "+this);
if(persistent)
container.store(blockNums);
- container.store(blockNums);
return ret;
}
return null;
@@ -223,7 +222,6 @@
if(persistent && !hasSet) {
hasSet = true;
container.store(blockNums);
- container.store(blockNums);
}
continue;
}
@@ -261,7 +259,6 @@
}
if(persistent) {
container.store(blockNums);
- container.store(blockNums);
container.deactivate(blockNums, 2);
container.activate(segment, 1);
container.activate(parent, 1);
@@ -399,7 +396,6 @@
}
if(persistent && removed)
container.store(blockNums);
- container.store(blockNums);
}
if(!block.isMetadata()) {
onSuccess(data, fromStore, (Integer)token,
((Integer)token).intValue(), block, container, context);
@@ -563,7 +559,6 @@
}
if(persistent)
container.store(blockNums);
- container.store(blockNums);
if(schedule) {
// Only need to register once for all the blocks.
try {
@@ -620,7 +615,6 @@
}
if(persistent)
container.store(blockNums);
- container.store(blockNums);
if(schedule) {
if(dontSchedule) return true;
try {
@@ -723,10 +717,8 @@
container.deactivate(segment, 1);
if(container.ext().isStored(this))
container.store(this);
- container.store(this);
if(container.ext().isStored(blockNums))
container.store(blockNums);
- container.store(blockNums);
container.deactivate(blockNums, 1);
}
}
@@ -816,7 +808,6 @@
}
if(persistent && !callerActivatesAndSets) {
container.store(blockNums);
- container.store(blockNums);
container.deactivate(blockNums, 2);
}
return found;
@@ -830,7 +821,6 @@
store |= removeBlockNum(blockNos[i], container, true);
if(persistent) {
if(store) container.store(blockNums);
- if(store) container.store(blockNums);
container.deactivate(blockNums, 2);
}
}
Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -121,7 +121,6 @@
for(int i=0;i<dataBuckets.length;i++) {
// If we don't set them now, they will be set
when the segment is set, which means they will be set deactivated, and cause
NPEs.
container.store(dataBuckets[i]);
- container.store(dataBuckets[i]);
container.deactivate(dataBuckets[i], 1);
if(dataBuckets.length > segmentSize) //
Otherwise we are nulling out within the segment
dataBuckets[i] = null;
@@ -137,7 +136,6 @@
if(persistent) {
for(int i=0;i<segments.length;i++) {
container.store(segments[i]);
- container.store(segments[i]);
container.deactivate(segments[i], 1);
}
}
@@ -407,7 +405,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.activate(cb, 1);
}
cb.onFailure(e, this, container, context);
@@ -524,7 +521,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
onAllFinished(container, context);
}
@@ -552,7 +548,6 @@
if(persistent) {
container.activate(cb, 1);
container.store(this);
- container.store(this);
}
cb.onFetchable(this, container);
}
@@ -595,7 +590,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
for(int i=0;i<segments.length;i++) {
if(persistent)
container.activate(segments[i], 1);
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-09-26 19:23:40 UTC (rev 22853)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -489,7 +489,6 @@
}
if(persistent)
container.store(this);
- container.store(this);
if (fetchable)
parent.segmentFetchable(this, container);
if (fin)
@@ -547,7 +546,6 @@
if(persistent)
container.store(this);
- container.store(this);
// Tell parent only after have started the inserts.
// Because of the counting.
@@ -565,7 +563,6 @@
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(parent, 1);
}
}
@@ -588,7 +585,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
}
parent.segmentFinished(this, container, context);
}
@@ -610,7 +606,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.deactivate(errors, 5);
}
parent.segmentFinished(this, container, context);
@@ -637,7 +632,6 @@
blocksGotURI++;
if(persistent)
container.store(this);
- container.store(this);
if (blocksGotURI != dataBlocks.length +
checkBlocks.length)
return;
// Double check
@@ -658,7 +652,6 @@
if(persistent) {
container.activate(parent, 1);
container.store(this);
- container.store(this);
}
parent.segmentHasURIs(this, container, context);
if(persistent)
@@ -717,7 +710,6 @@
return;
if(persistent)
container.store(this);
- container.store(this);
finish(container, context, parent);
}
@@ -766,7 +758,6 @@
blocksCompleted++;
if(persistent)
container.store(this);
- container.store(this);
return blocksCompleted;
}
@@ -844,7 +835,6 @@
}
if(persistent) {
container.store(this);
- container.store(this);
container.activate(parent, 1);
}
parent.segmentFinished(this, container, context);
Modified: branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -68,14 +68,12 @@
ObjectContainer container, FetchContext ctx, boolean
keepLast, int token) {
USKFetcherTag tag = new USKFetcherTag(usk, callback,
nodeDBHandle, persistent, container, ctx, keepLast, token);
if(persistent) container.store(tag);
- if(persistent) container.store(tag);
return tag;
}
synchronized void updatedEdition(long ed, ObjectContainer container) {
if(edition < ed) edition = ed;
if(persistent) container.store(this); // Update
- if(persistent) container.store(this); // Update
}
private static final RequestClient client = new RequestClient() {
@@ -110,7 +108,6 @@
public void run(ObjectContainer container,
ClientContext context) {
container.store(USKFetcherTag.this);
- container.store(USKFetcherTag.this);
}
}, NativeThread.HIGH_PRIORITY, false);
@@ -136,7 +133,6 @@
container.activate(callback, 1);
callback.onCancelled(container,
context);
container.store(this);
- container.store(this);
container.deactivate(callback, 1);
}
@@ -157,7 +153,6 @@
container.activate(callback, 1);
callback.onFailure(container, context);
container.store(this);
- container.store(this);
container.deactivate(callback, 1);
}
@@ -190,7 +185,6 @@
container.activate(callback, 1);
callback.onFoundEdition(l, key,
container, context, metadata, codec, data);
container.store(this);
- container.store(this);
container.deactivate(callback, 1);
}
Modified: branches/db4o/freenet/src/freenet/node/SendableRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-09-26
19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-09-26
20:51:26 UTC (rev 22854)
@@ -95,7 +95,6 @@
parentGrabArray = parent;
if(persistent())
container.store(this);
- container.store(this);
}
public void unregister(ObjectContainer container, ClientContext
context) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-09-26
19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-09-26
20:51:26 UTC (rev 22854)
@@ -332,7 +332,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this); // Update
- container.store(this); // Update
}
@Override
@@ -426,7 +425,6 @@
if(persistenceType == PERSIST_FOREVER) {
returnBucket.storeTo(container);
container.store(this);
- container.store(this);
}
finish(container);
client.notifySuccess(this, container);
@@ -468,7 +466,6 @@
allDataPending = msg;
if(persistenceType == ClientRequest.PERSIST_FOREVER)
container.store(this);
- container.store(this);
} else {
if(persistenceType == PERSIST_FOREVER)
container.activate(client, 1);
@@ -481,7 +478,6 @@
progressPending = msg;
if(persistenceType == ClientRequest.PERSIST_FOREVER)
container.store(this);
- container.store(this);
}
if(persistenceType == PERSIST_FOREVER)
container.activate(client, 1);
@@ -547,7 +543,6 @@
if(persistenceType == PERSIST_FOREVER) {
container.activate(client, 1);
container.store(this);
- container.store(this);
}
finish(container);
client.notifyFailure(this, container);
@@ -888,7 +883,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this);
- container.store(this);
}
return true;
} catch (FetchException e) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-09-26
19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-09-26
20:51:26 UTC (rev 22854)
@@ -373,7 +373,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this); // Update
- container.store(this); // Update
} catch (InsertException e) {
synchronized(this) {
started = true;
@@ -512,7 +511,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this);
- container.store(this);
return true;
} catch (InsertException e) {
onFailure(e, null, container);
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -171,7 +171,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this);
- container.store(this);
trySendGeneratedURIMessage(null, container);
}
@@ -310,7 +309,6 @@
progressMessage = msg;
}
container.store(this);
- container.store(this);
} else {
context.jobRunner.queue(new DBJob() {
@@ -506,6 +504,5 @@
progress.removeFrom(container);
if(persistenceType == PERSIST_FOREVER)
container.store(this);
- container.store(this);
}
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -232,7 +232,6 @@
}
if(persistenceType == PERSIST_FOREVER)
container.store(this); // Update
- container.store(this); // Update
} catch (InsertException e) {
started = true;
onFailure(e, null, container);
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -218,7 +218,6 @@
freeData(container);
if(persistenceType == PERSIST_FOREVER)
container.store(this);
- container.store(this);
}
public boolean isPersistentForever() {
@@ -263,7 +262,6 @@
client.finishedClientRequest(this, container);
if(persistenceType == ClientRequest.PERSIST_FOREVER)
container.store(this);
- container.store(this);
}
/**
@@ -355,7 +353,6 @@
if(persistenceType == PERSIST_FOREVER) {
container.store(this);
- container.store(this);
container.commit(); // commit before we send the message
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "COMMITTED");
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -249,7 +249,6 @@
try {
getter.register(container, false, false);
container.store(getter);
-
container.store(getter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this, "Identifier collision on "+this);
FCPMessage msg = new IdentifierCollisionMessage(id, global);
@@ -318,7 +317,6 @@
try {
putter.register(container, false, false);
container.store(putter);
-
container.store(putter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this, "Identifier collision on "+this);
FCPMessage msg
= new IdentifierCollisionMessage(id, global);
@@ -385,7 +383,6 @@
try {
putter.register(container, false, false);
container.store(putter);
- container.store(putter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this,
"Identifier collision on "+this);
FCPMessage msg = new
IdentifierCollisionMessage(id, global);
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -42,7 +42,6 @@
}
FCPPersistentRoot root = new FCPPersistentRoot(nodeDBHandle,
container);
container.store(root);
- container.store(root);
System.err.println("Created FCP persistent root.");
return root;
}
@@ -79,7 +78,6 @@
}
FCPClient client = new FCPClient(name, handler, false, null,
ClientRequest.PERSIST_FOREVER, this, container);
container.store(client);
- container.store(client);
return client;
}
Modified: branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -52,7 +52,6 @@
if(logMINOR) Logger.minor(this, "Added: "+req+" to
"+this+" size now "+index);
if(persistent) {
container.store(this);
- container.store(this);
}
}
}
@@ -148,20 +147,17 @@
if(logMINOR)
Logger.minor(this, "Chosen random item "+ret+" out of "+valid);
if(persistent &&
changedMe)
container.store(this);
-
container.store(this);
return ret;
}
if(valid == 0 && exclude == 0) {
index = 0;
if(persistent)
container.store(this);
-
container.store(this);
if(logMINOR)
Logger.minor(this, "No valid or excluded items");
return null;
} else if(valid == 0) {
if(persistent &&
changedMe)
container.store(this);
-
container.store(this);
if(logMINOR)
Logger.minor(this, "No valid items, "+exclude+" excluded items");
return null;
} else if(valid == 1) {
@@ -180,7 +176,6 @@
}
if(persistent &&
changedMe)
container.store(this);
-
container.store(this);
return ret;
} else {
random =
context.fastWeakRandom.nextInt(valid);
@@ -217,7 +212,6 @@
Logger.normal(this, "Remove
random returning null because "+excluded+" excluded items, length = "+index,
new Exception("error"));
if(persistent && changedMe)
container.store(this);
- container.store(this);
return null;
}
continue;
@@ -226,7 +220,6 @@
if(logMINOR) Logger.minor(this,
"Returning (cannot remove): "+ret+" of "+index);
if(persistent && changedMe)
container.store(this);
- container.store(this);
return ret;
}
// Remove an element.
@@ -255,7 +248,6 @@
ret.setParentGrabArray(null, container);
if(persistent)
container.store(this);
- container.store(this);
return ret;
}
@@ -273,7 +265,6 @@
it.setParentGrabArray(null, container);
if(persistent) {
container.store(this);
- container.store(this);
}
}
Modified: branches/db4o/freenet/src/freenet/support/SectoredRandomGrabArray.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/SectoredRandomGrabArray.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/SectoredRandomGrabArray.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -53,9 +53,7 @@
addElement(client, rga);
if(persistent) {
container.store(rga);
- container.store(rga);
container.store(this);
- container.store(this);
}
} else {
rga = (RandomGrabArrayWithClient)
grabArrays[clientIndex];
@@ -113,7 +111,6 @@
addElement(client, requestGrabber);
if(persistent) {
container.store(this);
- container.store(this);
}
}
@@ -140,7 +137,6 @@
grabClients = new Object[0];
if(persistent)
container.store(this);
- container.store(this);
}
if(logMINOR)
Logger.minor(this, "Returning (one item
only) "+item+" for "+rga);
@@ -179,7 +175,6 @@
grabClients = new Object[0];
if(persistent)
container.store(this);
- container.store(this);
} else if(firstRGA.isEmpty()) {
if(persistent) {
container.activate(firstRGA, 1);
@@ -188,7 +183,6 @@
grabClients = new Object[] {
grabClients[x] };
if(persistent)
container.store(this);
- container.store(this);
}
if(persistent) {
container.deactivate(rga, 1);
@@ -225,7 +219,6 @@
removeElement(x);
if(persistent)
container.store(this);
- container.store(this);
}
if(item == null) {
if(!rga.isEmpty()) {
Modified:
branches/db4o/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -61,7 +61,6 @@
public void storeTo(ObjectContainer container) {
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/SortedVectorByNumber.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/SortedVectorByNumber.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/SortedVectorByNumber.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -62,7 +62,6 @@
data = newData;
}
if(persistent) container.store(this);
- if(persistent) container.store(this);
verify(container);
}
@@ -139,7 +138,6 @@
length++;
if(persistent)
container.store(this);
- container.store(this);
verify(container);
}
Modified: branches/db4o/freenet/src/freenet/support/io/ArrayBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/ArrayBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/ArrayBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -197,9 +197,7 @@
public void storeTo(ObjectContainer container) {
container.store(data);
- container.store(data);
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/BucketChainBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/BucketChainBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/BucketChainBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -298,9 +298,7 @@
for(int i=0;i<buckets.size();i++)
((Bucket) buckets.get(i)).storeTo(container);
container.store(buckets);
- container.store(buckets);
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/DelayedFreeBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -94,7 +94,6 @@
public void storeTo(ObjectContainer container) {
bucket.storeTo(container);
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/FileBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/FileBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/FileBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -111,7 +111,6 @@
public void storeTo(ObjectContainer container) {
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/MultiReaderBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/MultiReaderBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/MultiReaderBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -133,7 +133,6 @@
public void storeTo(ObjectContainer container) {
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/NullBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/NullBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/NullBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -76,7 +76,6 @@
public void storeTo(ObjectContainer container) {
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified:
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
---
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -400,9 +400,7 @@
public void storeTo(ObjectContainer container) {
container.store(bucket);
- container.store(bucket);
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified:
branches/db4o/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -153,7 +153,6 @@
public void storeTo(ObjectContainer container) {
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/TempBucketFactory.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/TempBucketFactory.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -345,7 +345,6 @@
public void storeTo(ObjectContainer container) {
currentBucket.storeTo(container);
container.store(this);
- container.store(this);
}
}
Modified: branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
2008-09-26 19:23:40 UTC (rev 22853)
+++ branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
2008-09-26 20:51:26 UTC (rev 22854)
@@ -94,9 +94,7 @@
public void storeTo(ObjectContainer container) {
container.store(generator);
- container.store(generator);
container.store(this);
- container.store(this);
}
public void removeFrom(ObjectContainer container) {
