Author: toad
Date: 2008-06-16 16:38:11 +0000 (Mon, 16 Jun 2008)
New Revision: 20368
Modified:
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/ClientPutDir.java
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Un-split lowLevelClient
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-16
16:35:34 UTC (rev 20367)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-16
16:38:11 UTC (rev 20368)
@@ -125,7 +125,7 @@
throw e;
}
getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
returnBucket, null);
if(persistenceType != PERSIST_CONNECTION) {
FCPMessage msg = persistentTagMessage();
@@ -198,7 +198,7 @@
}
getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
binaryBlob ? new NullBucket() :
returnBucket, binaryBlob ? returnBucket : null);
if(persistenceType != PERSIST_CONNECTION) {
FCPMessage msg = persistentTagMessage();
@@ -302,7 +302,7 @@
getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler,
uri,
fctx, priorityClass,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
binaryBlob ? new NullBucket() : returnBucket,
binaryBlob ? returnBucket :
null);
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-16
16:35:34 UTC (rev 20367)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-16
16:38:11 UTC (rev 20368)
@@ -148,7 +148,7 @@
putter = new ClientPutter(this, data, uri, cm,
ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
getCHKOnly, isMetadata,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
null, targetFilename, binaryBlob);
if(persistenceType != PERSIST_CONNECTION) {
FCPMessage msg = persistentTagMessage();
@@ -260,7 +260,7 @@
putter = new ClientPutter(this, data, uri, cm,
ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
getCHKOnly, isMetadata,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
null, targetFilename, binaryBlob);
if(persistenceType != PERSIST_CONNECTION) {
FCPMessage msg = persistentTagMessage();
@@ -354,7 +354,7 @@
if(finished) oldProgress = null; // Not useful any more
putter = new ClientPutter(this, data, uri, cm, ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
priorityClass, getCHKOnly, isMetadata,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
oldProgress, targetFilename, binaryBlob);
if(persistenceType != PERSIST_CONNECTION) {
FCPMessage msg = persistentTagMessage();
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-16 16:35:34 UTC (rev 20367)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-16 16:38:11 UTC (rev 20368)
@@ -131,7 +131,7 @@
try {
p = new SimpleManifestPutter(this,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
manifestElements, priorityClass, uri,
defaultName, ctx, getCHKOnly,
- persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
+ client.lowLevelClient,
earlyEncode);
} catch (InsertException e) {
onFailure(e, null);
@@ -212,7 +212,7 @@
if(!finished)
p = new SimpleManifestPutter(this,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
manifestElements,
priorityClass, uri, defaultName, ctx, getCHKOnly,
- persistenceType ==
PERSIST_CONNECTION ? client.lowLevelClientTransient :
client.lowLevelClientPersistent,
+ client.lowLevelClient,
earlyEncode);
} catch (InsertException e) {
onFailure(e, null);
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-16
16:35:34 UTC (rev 20367)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-16
16:38:11 UTC (rev 20368)
@@ -33,16 +33,12 @@
assert(persistenceType == ClientRequest.PERSIST_FOREVER ||
persistenceType == ClientRequest.PERSIST_REBOOT);
watchGlobalVerbosityMask = Integer.MAX_VALUE;
toStart = new LinkedList();
- lowLevelClientPersistent = new RequestClient() {
+ final boolean forever = (persistenceType ==
ClientRequest.PERSIST_FOREVER);
+ lowLevelClient = new RequestClient() {
public boolean persistent() {
- return true;
+ return forever;
}
};
- lowLevelClientTransient = new RequestClient() {
- public boolean persistent() {
- return false;
- }
- };
completionCallback = cb;
if(persistenceType == ClientRequest.PERSIST_FOREVER) {
assert(root != null);
@@ -72,8 +68,7 @@
private transient LinkedList clientsWatching;
private final Object clientsWatchingLock = new Object();
private final LinkedList toStart;
- final RequestClient lowLevelClientPersistent;
- final RequestClient lowLevelClientTransient;
+ final RequestClient lowLevelClient;
private transient RequestCompletionCallback completionCallback;
/** Connection mode */
final short persistenceType;
@@ -316,8 +311,7 @@
container.delete(completedUnackedRequests);
container.delete(clientRequestsByIdentifier);
container.delete(toStart);
- container.delete(lowLevelClientPersistent);
- container.delete(lowLevelClientTransient);
+ container.delete(lowLevelClient);
container.delete(this);
}
}
