Author: toad
Date: 2008-12-18 00:51:43 +0000 (Thu, 18 Dec 2008)
New Revision: 24501
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Remove unused arguments
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-12-18 00:33:00 UTC (rev 24500)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-12-18 00:51:43 UTC (rev 24501)
@@ -143,7 +143,7 @@
InsertContext context = getInsertContext(true);
PutWaiter pw = new PutWaiter();
ClientPutter put = new ClientPutter(pw, insert.getData(),
insert.desiredURI, insert.clientMetadata,
- context, core.requestStarters.chkPutScheduler,
core.requestStarters.sskPutScheduler, priorityClass,
+ context, priorityClass,
getCHKOnly, isMetadata, this, null,
filenameHint, false);
core.clientContext.start(put, false);
return pw.waitForCompletion();
@@ -151,7 +151,7 @@
public ClientPutter insert(InsertBlock insert, boolean getCHKOnly,
String filenameHint, boolean isMetadata, InsertContext ctx, ClientCallback cb)
throws InsertException {
ClientPutter put = new ClientPutter(cb, insert.getData(),
insert.desiredURI, insert.clientMetadata,
- ctx, core.requestStarters.chkPutScheduler,
core.requestStarters.sskPutScheduler, priorityClass,
+ ctx, priorityClass,
getCHKOnly, isMetadata, this, null,
filenameHint, false);
core.clientContext.start(put, false);
return put;
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-18 00:33:00 UTC (rev 24500)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-18 00:51:43 UTC (rev 24501)
@@ -171,7 +171,8 @@
if(returnBucket != null &&
Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "client.async returned data
in returnBucket");
}
- state.removeFrom(container, context);
+ if(persistent())
+ state.removeFrom(container, context);
FetchResult res = result;
if(persistent()) {
container.store(this);
@@ -184,7 +185,8 @@
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Failed from "+state+" : "+e+" on
"+this, e);
closeBinaryBlobStream(container, context);
- state.removeFrom(container, context);
+ if(persistent())
+ state.removeFrom(container, context);
while(true) {
if(e.mode == FetchException.ARCHIVE_RESTART) {
int ar;
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-12-18 00:33:00 UTC (rev 24500)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-12-18 00:51:43 UTC (rev 24501)
@@ -56,7 +56,7 @@
* @param targetFilename If set, create a one-file manifest containing
this filename pointing to this file.
*/
public ClientPutter(ClientCallback client, Bucket data, FreenetURI
targetURI, ClientMetadata cm, InsertContext ctx,
- RequestScheduler chkScheduler, RequestScheduler
sskScheduler, short priorityClass, boolean getCHKOnly,
+ short priorityClass, boolean getCHKOnly,
boolean isMetadata, RequestClient clientContext,
SimpleFieldSet stored, String targetFilename, boolean binaryBlob) {
super(priorityClass, clientContext);
this.cm = cm;
Modified: branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2008-12-18
00:33:00 UTC (rev 24500)
+++ branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2008-12-18
00:51:43 UTC (rev 24501)
@@ -160,7 +160,6 @@
inserter = new ClientPutter(this, b, uri,
new ClientMetadata("text/plain") /* it
won't quite fit in an SSK anyway */,
node.clientCore.makeClient((short)0,
true).getInsertContext(true),
-
node.clientCore.requestStarters.chkPutScheduler,
node.clientCore.requestStarters.sskPutScheduler,
RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, false, this, null, null,
false);
try {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-12-18
00:33:00 UTC (rev 24500)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-12-18
00:51:43 UTC (rev 24501)
@@ -138,7 +138,7 @@
this.clientMetadata = cm;
putter = new ClientPutter(this, data, uri, cm,
- ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
+ ctx, priorityClass,
getCHKOnly, isMetadata,
client.lowLevelClient,
null, targetFilename, binaryBlob);
@@ -247,7 +247,7 @@
if(logMINOR) Logger.minor(this, "data = "+data+", uploadFrom =
"+ClientPutMessage.uploadFromString(uploadFrom));
putter = new ClientPutter(this, data, uri, cm,
- ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
+ ctx, priorityClass,
getCHKOnly, isMetadata,
client.lowLevelClient,
null, targetFilename, binaryBlob);
@@ -335,8 +335,8 @@
this.clientMetadata = cm;
SimpleFieldSet oldProgress = fs.subset("progress");
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,
+ putter = new ClientPutter(this, data, uri, cm, ctx,
+ priorityClass, getCHKOnly, isMetadata,
client.lowLevelClient,
oldProgress, targetFilename, binaryBlob);
if(persistenceType != PERSIST_CONNECTION) {
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-18 00:33:00 UTC (rev 24500)
+++
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-18 00:51:43 UTC (rev 24501)
@@ -1042,8 +1042,6 @@
FileBucket bucket = new FileBucket(blob, true, false, false,
false, false);
ClientPutter putter = new ClientPutter(callback, bucket,
FreenetURI.EMPTY_CHK_URI, null,
updateManager.node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS).getInsertContext(true),
-
updateManager.node.clientCore.requestStarters.chkPutScheduler,
-
updateManager.node.clientCore.requestStarters.sskPutScheduler,
RequestStarter.INTERACTIVE_PRIORITY_CLASS, false,
false, this, null, null, true);
try {
updateManager.node.clientCore.clientContext.start(putter, false);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
