[Thaw-dev] r11639 - in trunk/apps/Thaw/src/thaw: fcp plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-01-28 13:56:44 +0000 (Sun, 28 Jan 2007)
New Revision: 11639

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/plugins/index/File.java
Log:
Fix display bug when computing file keys

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-01-27 22:51:50 UTC 
(rev 11638)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-01-28 13:56:44 UTC 
(rev 11639)
@@ -750,9 +750,11 @@
                if(!removeRequest())
                        return false;

+               if (progress < 100)
+                       successful = false;
+
                progress = 100;
                running = false;
-               successful = false;
                fatal = true;
                status = "Stopped";
                setChanged();

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-01-27 22:51:50 UTC 
(rev 11638)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-01-28 13:56:44 UTC 
(rev 11639)
@@ -280,15 +280,15 @@

        private class UnlockWaiter implements Runnable {
                FCPClientPut clientPut;
-               FCPConnection connection;
+               FCPConnection c;

-               public UnlockWaiter(final FCPClientPut clientPut, final 
FCPConnection connection) {
+               public UnlockWaiter(final FCPClientPut clientPut, final 
FCPConnection c) {
                        this.clientPut = clientPut;
-                       this.connection = connection;
+                       this.c = c;
                }

                public void run() {
-                       connection.addToWriterQueue();
+                       c.addToWriterQueue();

                        lockOwner = true;

@@ -509,8 +509,11 @@
        public boolean stop(final FCPQueueManager queueManager) {
                if(removeRequest()) {
                        status = "Stopped";
+
+                       if (!finished)
+                               successful = false;
+
                        finished = true;
-                       successful = false;
                        fatal= true;
                        running = false;


Modified: trunk/apps/Thaw/src/thaw/plugins/index/File.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/File.java    2007-01-27 22:51:50 UTC 
(rev 11638)
+++ trunk/apps/Thaw/src/thaw/plugins/index/File.java    2007-01-28 13:56:44 UTC 
(rev 11639)
@@ -186,12 +186,16 @@
        }


+       private FCPTransferQuery transfer = null;
+
+
        public FCPTransferQuery getTransfer(FCPQueueManager q) {
-               FCPTransferQuery tr;
+               if (transfer != null)
+                       return transfer;

-               tr = q.getTransfer(getPublicKey());
+               transfer = q.getTransfer(getPublicKey());

-               return tr;
+               return transfer;
        }

        public void setPublicKey(final String publicKey) {