[Thaw-dev] r11212 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-03 14:43:45 +0000 (Sun, 03 Dec 2006)
New Revision: 11212

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
Log:
Should really fix bug 883 this time

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2006-12-03 14:37:17 UTC 
(rev 11211)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2006-12-03 14:43:45 UTC 
(rev 11212)
@@ -284,12 +284,18 @@
         */
        public FCPTransferQuery getTransfer(String key) {
                boolean interrupted=true;
-
+               boolean isAKey = true;
                Iterator it;

                if (key == null)
                        return null;

+               if (key.startsWith("SSK@") || key.startsWith("USK@")
+                   || key.startsWith("KSK@") || key.startsWith("CHK@"))
+                       isAKey = true;
+               else
+                       isAKey = false;
+
                while(interrupted) {
                        interrupted = false;

@@ -298,9 +304,15 @@
                                    it.hasNext(); )
                                        {
                                                FCPTransferQuery plop = 
(FCPTransferQuery)it.next();
-                                               if (plop.getFileKey() == key
-                                                   || 
key.equals(plop.getFileKey()))
-                                                       return plop;
+                                               if (isAKey) {
+                                                       if (plop.getFileKey() 
== key
+                                                           || 
key.equals(plop.getFileKey()))
+                                                               return plop;
+                                               } else {
+                                                       if (plop.getFilename() 
== key
+                                                           || 
key.equals(plop.getFilename()))
+                                                               return plop;
+                                               }
                                        }

                                for(int i = 0 ; i <= PRIORITY_MIN ; i++) {
@@ -308,9 +320,15 @@
                                            it.hasNext(); )
                                                {
                                                        FCPTransferQuery plop = 
(FCPTransferQuery)it.next();
-                                                       if (plop.getFileKey() 
== key
-                                                           || 
key.equals(plop.getFileKey()))
-                                                               return plop;
+                                                       if (isAKey) {
+                                                               if 
(plop.getFileKey() == key
+                                                                   || 
key.equals(plop.getFileKey()))
+                                                                       return 
plop;
+                                                       } else {
+                                                               if 
(plop.getFilename() == key
+                                                                   || 
key.equals(plop.getFilename()))
+                                                                       return 
plop;
+                                                       }
                                                }

                                }