Author: xor
Date: 2008-11-16 19:45:37 +0000 (Sun, 16 Nov 2008)
New Revision: 23661
Modified:
trunk/plugins/WoT/IdentityFetcher.java
trunk/plugins/WoT/IdentityInserter.java
trunk/plugins/WoT/OwnIdentity.java
trunk/plugins/WoT/introduction/IntroductionClient.java
trunk/plugins/WoT/introduction/IntroductionServer.java
Log:
Revert previous attempt to fix identity insertion and try with a different
approach: Set requests & inserts to maximum priority, i.e. do not set them, the
PluginManager does that by default.
Modified: trunk/plugins/WoT/IdentityFetcher.java
===================================================================
--- trunk/plugins/WoT/IdentityFetcher.java 2008-11-16 19:20:34 UTC (rev
23660)
+++ trunk/plugins/WoT/IdentityFetcher.java 2008-11-16 19:45:37 UTC (rev
23661)
@@ -105,7 +105,7 @@
fetchContext.maxSplitfileBlockRetries = -1; // retry forever
fetchContext.maxNonSplitfileRetries = -1; // retry forever
ClientGetter g = client.fetch(uri, -1, this, this,
fetchContext);
- g.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /*
FIXME: decide which one to use */
+ // g.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /*
pluginmanager defaults to interactive priority */
synchronized(requests) {
requests.add(g);
}
Modified: trunk/plugins/WoT/IdentityInserter.java
===================================================================
--- trunk/plugins/WoT/IdentityInserter.java 2008-11-16 19:20:34 UTC (rev
23660)
+++ trunk/plugins/WoT/IdentityInserter.java 2008-11-16 19:45:37 UTC (rev
23661)
@@ -188,12 +188,12 @@
// Prepare the insert
ClientMetadata cmd = new ClientMetadata("text/xml");
- InsertBlock ib = new
InsertBlock(tempB,cmd,identity.getInsertURIWithFilename());
+ InsertBlock ib = new
InsertBlock(tempB,cmd,identity.getInsertURI());
InsertContext ictx = client.getInsertContext(true);
/* FIXME: are these parameters correct? */
ClientPutter pu = client.insert(ib, false,
"identity.xml", false, ictx, this);
-
pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS);
+ //
pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /* pluginmanager
defaults to interactive priority */
synchronized(mInserts) {
mInserts.add(pu);
}
Modified: trunk/plugins/WoT/OwnIdentity.java
===================================================================
--- trunk/plugins/WoT/OwnIdentity.java 2008-11-16 19:20:34 UTC (rev 23660)
+++ trunk/plugins/WoT/OwnIdentity.java 2008-11-16 19:45:37 UTC (rev 23661)
@@ -290,10 +290,6 @@
return insertURI;
}
- public FreenetURI getInsertURIWithFilename() {
- return getInsertURI().pushMetaString("identity.xml");
- }
-
/**
* Sets this OwnIdentity's insertURI.
* The key must be a USK or a SSK, and is stored as a USK anyway.
Modified: trunk/plugins/WoT/introduction/IntroductionClient.java
===================================================================
--- trunk/plugins/WoT/introduction/IntroductionClient.java 2008-11-16
19:20:34 UTC (rev 23660)
+++ trunk/plugins/WoT/introduction/IntroductionClient.java 2008-11-16
19:45:37 UTC (rev 23661)
@@ -200,7 +200,7 @@
/* FIXME: are these parameters correct? */
ClientPutter pu = mClient.insert(ib, false, null,
false, ictx, this);
-
pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS);
+
//pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /* pluginmanager
defaults to interactive priority */
synchronized(mInserts) {
mInserts.add(pu);
}
@@ -299,7 +299,7 @@
fetchContext.maxSplitfileBlockRetries = -1; // retry forever
fetchContext.maxNonSplitfileRetries = -1; // retry forever
ClientGetter g = mClient.fetch(uri, -1, this, this,
fetchContext);
- g.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /*
FIXME: decide which one to use */
+ //g.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /*
pluginmanager defaults to interactive priority */
synchronized(mRequests) {
mRequests.add(g);
}
Modified: trunk/plugins/WoT/introduction/IntroductionServer.java
===================================================================
--- trunk/plugins/WoT/introduction/IntroductionServer.java 2008-11-16
19:20:34 UTC (rev 23660)
+++ trunk/plugins/WoT/introduction/IntroductionServer.java 2008-11-16
19:45:37 UTC (rev 23661)
@@ -244,7 +244,7 @@
/* FIXME: are these parameters correct?
*/
ClientPutter pu = mClient.insert(ib,
false, null, false, ictx, this);
-
pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS);
+ //
pu.setPriorityClass(RequestStarter.UPDATE_PRIORITY_CLASS); /* pluginmanager
defaults to interactive priority */
synchronized(mInserts) {
mInserts.add(pu);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
