[Thaw-dev] r14495 - in trunk/apps/Thaw: . src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-08-06 19:10:45 +0000 (Mon, 06 Aug 2007)
New Revision: 14495

Modified:
   trunk/apps/Thaw/launch4j.xml
   trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java
Log:
Argh I'm stupid : If I take the write lock while waiting for an input on the 
socket, I can't send the ClientHello ...

Modified: trunk/apps/Thaw/launch4j.xml
===================================================================
--- trunk/apps/Thaw/launch4j.xml        2007-08-06 18:59:58 UTC (rev 14494)
+++ trunk/apps/Thaw/launch4j.xml        2007-08-06 19:10:45 UTC (rev 14495)
@@ -1,7 +1,7 @@
 <launch4jConfig>
   <headerType>0</headerType>
-  <outfile>lib/Thaw.exe</outfile>
-  <jar>lib/Thaw.jar</jar>
+  <outfile>bin/Thaw.exe</outfile>
+  <jar>bin/Thaw.jar</jar>
   <dontWrapJar>false</dontWrapJar>

   <errTitle>Thaw</errTitle>

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java   2007-08-06 18:59:58 UTC 
(rev 14494)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java   2007-08-06 19:10:45 UTC 
(rev 14495)
@@ -148,9 +148,10 @@
        }

        /**
-        * Multithreading allow the use of a watchdog
+        * Multithreading allow the use of a watchdog. It's useful to debug,
+        * but I recommand to desactivate it for a normal use.
         */
-       public final static boolean MULTITHREADED = true;
+       public final static boolean MULTITHREADED = false;

        /**
         * Will listen in loop for new incoming messages.
@@ -164,11 +165,11 @@
                         *        sending a big file may generate a lot of 
threads (and warnings because
                         *        of a possible freeze)
                         */
-                       if (MULTITHREADED)
+                       latestMessage = readMessage();
+                       if (MULTITHREADED) {
                                connection.addToWriterQueue();
-                       latestMessage = readMessage();
-                       if (MULTITHREADED)
                                connection.removeFromWriterQueue();
+                       }

                        Logger.verbose(this, "Message received. Notifying 
observers");