Author: jflesch
Date: 2008-01-31 12:15:07 +0000 (Thu, 31 Jan 2008)
New Revision: 17419
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
FCPClientGet, fix : Use the required blocks number instead of the total number
to compute file size
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-30 22:43:32 UTC
(rev 17418)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-31 12:15:07 UTC
(rev 17419)
@@ -513,7 +513,7 @@
&& message.getValue("Required") != null
&& message.getValue("Succeeded") !=
null) {
- fileSize =
Long.parseLong(message.getValue("Total"))*FCPClientGet.BLOCK_SIZE;
+ fileSize =
Long.parseLong(message.getValue("Required"))*FCPClientGet.BLOCK_SIZE;
final long total =
Long.parseLong(message.getValue("Total"));
final long required =
Long.parseLong(message.getValue("Required"));
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2008-01-30 22:43:32 UTC
(rev 17418)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2008-01-31 12:15:07 UTC
(rev 17419)
@@ -12,7 +12,7 @@
* Some methods are only useful for downloads, and some for insertions, so
check getQueryType() before calling them.
*/
public abstract class FCPTransferQuery extends Observable implements FCPQuery {
- public final static int BLOCK_SIZE = 16384;
+ public final static int BLOCK_SIZE = 32768;
public final static int KEY_TYPE_CHK = 0;
public final static int KEY_TYPE_KSK = 1;
public final static int KEY_TYPE_SSK = 2; /* also USK */
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2008-01-30 22:43:32 UTC (rev 17418)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2008-01-31 12:15:07 UTC (rev 17419)
@@ -206,6 +206,9 @@
KSKBoard daBoard = ((board != null) ?
board :
factory.getBoard(set.getInt("boardId")));
+
+ if (daBoard == null)
+ Logger.warning(new KSKBoard(),
"Can't find the board n?"+Integer.toString(set.getInt("boardId"))+"");
int sigId = set.getInt("sigId");
String nick = set.getString("nickname");
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2008-01-30 22:43:32 UTC (rev 17418)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2008-01-31 12:15:07 UTC (rev 17419)
@@ -447,6 +447,11 @@
String content;
try {
+ if (board == null)
+ Logger.error(this, "No ref to the corresponding
board ?!");
+ else if (board.getFactory() == null)
+ Logger.error(this, "Can't access the board
factory ?!");
+
Hsqldb db = board.getFactory().getDb();
synchronized(db.dbLock) {
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2008-01-30 22:43:32 UTC (rev 17418)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2008-01-31 12:15:07 UTC (rev 17419)
@@ -85,9 +85,9 @@
public int getRowCount() {
- if(queries != null)
+ if(queries != null) {
return queries.size();
- else
+ } else
return 0;
}
