Author: jflesch
Date: 2007-06-04 23:09:41 +0000 (Mon, 04 Jun 2007)
New Revision: 13467
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java
Log:
Fix file fetching when using non-global queue
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-06-04 22:42:10 UTC
(rev 13466)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-06-04 23:09:41 UTC
(rev 13467)
@@ -603,8 +603,12 @@
Logger.info(this, "Duplicating socket ...");
- duplicatedQueryManager =
queueManager.getQueryManager().duplicate(identifier);
- duplicatedQueryManager.addObserver(this);
+ if (globalQueue) {
+ duplicatedQueryManager =
queueManager.getQueryManager().duplicate(identifier);
+ duplicatedQueryManager.addObserver(this);
+ } else { /* won't duplicate ; else it will use another id */
+ duplicatedQueryManager = queueManager.getQueryManager();
+ }
Logger.info(this, "Waiting for socket ...");
status = "Waiting for socket availability ...";
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2007-06-04 22:42:10 UTC
(rev 13466)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2007-06-04 23:09:41 UTC
(rev 13467)
@@ -57,8 +57,9 @@
boolean global = true;
- if("false".equals( msg.getValue("Global") ))
- global = false;
+ if (msg.getValue("Global") != null) {
+ global =
Boolean.valueOf(msg.getValue("Global"));
+ }
String destinationDir = null;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java 2007-06-04
22:42:10 UTC (rev 13466)
+++ trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java 2007-06-04
23:09:41 UTC (rev 13467)
@@ -276,27 +276,18 @@
try {
synchronized(db.dbLock) {
PreparedStatement st =
db.getConnection().prepareStatement("INSERT INTO indexBlackList (publicKey,
name) VALUES (?, ?)");
- PreparedStatement anotherSt =
db.getConnection().prepareStatement("UPDATE links SET blackListed = true WHERE
id = ?");
st.setString(1, key);
st.setString(2, Index.getNameFromKey(key));
st.execute();
-
- st =
db.getConnection().prepareStatement("SELECT id, publicKey FROM links WHERE "+
-
"LOWER(publicKey) LIKE ? LIMIT 1");
+ st =
db.getConnection().prepareStatement("UPDATE links "+
+ "SET
blackListed = true "+
+ "WHERE
LOWER(publicKey) LIKE ?");
st.setString(1,
FreenetURIHelper.getComparablePart(key) +"%");
- ResultSet res = st.executeQuery();
+ st.execute();
-
- if (!res.next()) {
- return false;
- }
-
- anotherSt.setInt(1, res.getInt("id"));
- anotherSt.execute();
-
}
} catch(SQLException e) {
Logger.error(new BlackList(), "Error while adding an
entry to the blacklist : "+e.toString());
