[freenet-cvs] r18049 - trunk/freenet/src/freenet/client

[rob...@freenetproject.org]

Author: robert
Date: 2008-02-18 19:53:03 +0000 (Mon, 18 Feb 2008)
New Revision: 18049

Modified:
   trunk/freenet/src/freenet/client/FECCodec.java
Log:
synchronization readability


Modified: trunk/freenet/src/freenet/client/FECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/FECCodec.java      2008-02-18 19:31:06 UTC 
(rev 18048)
+++ trunk/freenet/src/freenet/client/FECCodec.java      2008-02-18 19:53:03 UTC 
(rev 18049)
@@ -337,12 +337,10 @@
                                executor.execute(fecRunner, "FEC Pool 
"+fecPoolCounter++);
                                runningFECThreads++;
                        }
+                       _awaitingJobs.notifyAll();
                }
                if(logMINOR)
                        Logger.minor(StandardOnionFECCodec.class, "Adding a new 
job to the queue (" + _awaitingJobs.size() + ").");
-               synchronized(fecRunner) {
-                       fecRunner.notifyAll();
-               }
        }
        private static final LinkedList _awaitingJobs = new LinkedList();
        private static final FECRunner fecRunner = new FECRunner();
@@ -363,9 +361,10 @@
                        try {
                                while(true) {
                                        FECJob job = null;
-                                       try {
                                                // Get a job
                                                synchronized(_awaitingJobs) {
+                                                       while 
(_awaitingJobs.isEmpty())
+                                                               
_awaitingJobs.wait(Integer.MAX_VALUE);
                                                        job = (FECJob) 
_awaitingJobs.removeLast();
                                                }

@@ -397,14 +396,6 @@
                                                } catch(Throwable e) {
                                                        Logger.error(this, "The 
callback failed!" + e.getMessage(), e);
                                                }
-                                       } catch(NoSuchElementException ne) {
-                                               try {
-                                                       synchronized(this) {
-                                                               
wait(Integer.MAX_VALUE);
-                                                       }
-                                               } catch(InterruptedException e) 
{
-                                               }
-                                       }
                                }
                        } catch (Throwable t) {
                                Logger.error(this, "Caught "+t+" in "+this, t);