Author: jflesch
Date: 2007-01-27 18:33:43 +0000 (Sat, 27 Jan 2007)
New Revision: 11627
Modified:
trunk/apps/Thaw/src/thaw/plugins/index/File.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Really remove the transfer when a key computation ends .....
Modified: trunk/apps/Thaw/src/thaw/plugins/index/File.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-01-27 18:27:03 UTC
(rev 11626)
+++ trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-01-27 18:33:43 UTC
(rev 11627)
@@ -67,12 +67,20 @@
if (FreenetURIHelper.isAKey(key)) {
setPublicKey(key);
- o.deleteObserver(this);
}
- if (queueManager != null) {
- queueManager.remove(put);
- queueManager = null;
+ if (put.isFinished() && put.isSuccessful()) {
+ o.deleteObserver(this);
+
+
+ if (queueManager != null) {
+ Logger.notice(this, "REMOVING");
+ if(put.stop(queueManager)) {
+ queueManager.remove(put);
+ }
+
+ queueManager = null;
+ }
}
return;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-27 18:27:03 UTC (rev 11626)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-27 18:33:43 UTC (rev 11627)
@@ -1185,19 +1185,6 @@
FCPTransferQuery insertion = null;
- if(insert) {
- insertion = new
FCPClientPut(ioFile, 0, 0, null,
- null,
FCPClientPut.DEFAULT_INSERTION_PRIORITY,
-
true, 0, false);
-
queueManager.addQueryToThePendingQueue(insertion);
- } else {
- insertion = new
FCPClientPut(ioFile, 0, 0, null,
-
null, FCPClientPut.DEFAULT_INSERTION_PRIORITY,
-
true, 2, true); /* getCHKOnly */
-
queueManager.addQueryToTheRunningQueue(insertion);
- }
-
-
st.setInt(1, nextId);
st.setString(2, ioFile.getName());
st.setString(3, ioFile.getName() /*
stand as public key for the moment */);
@@ -1211,7 +1198,11 @@
File file = new File(db, nextId);
-
((Observable)insertion).addObserver(file);
+ if (insert) {
+
file.insertOnFreenet(queueManager);
+ } else {
+
file.recalculateCHK(queueManager);
+ }
nextId++;
} catch(SQLException e) {
