--- projects/cms/source/util/uk/org/iscream/cms/util/Queue.java	2001/03/26 17:59:47	1.20
+++ projects/cms/source/util/uk/org/iscream/cms/util/Queue.java	2001/04/04 20:51:16	1.21
@@ -14,7 +14,7 @@ import uk.org.iscream.util.*;
  * actually contains some elements.
  *
  * @author  $Author: tdb $
- * @version $Id: Queue.java,v 1.20 2001/03/26 17:59:47 tdb Exp $
+ * @version $Id: Queue.java,v 1.21 2001/04/04 20:51:16 tdb Exp $
  */
 public class Queue {
 
@@ -23,7 +23,7 @@ public class Queue {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.20 $";
+    public static final String REVISION = "$Revision: 1.21 $";
     
     /**
      * Pass to constructor to remove a RANDOM item from
@@ -94,25 +94,27 @@ public class Queue {
         for(int i=0; i < _lists.size(); i++) {
             // skip over any gaps left in the list
             if(_lists.get(i) != null) {
-                // get size before adding to the Queue
-                int s = ((LinkedList) _lists.get(i)).size();
-                // check whether we need to remove an item from the current Queue
-                if(_maxSize!=-1 && s>=_maxSize && _removeAlgorithm!=DROP) {
-                    // we need to remove an item
-                    removeQueueItem((LinkedList) _lists.get(i));
-                }
-                // check if we should add (not if Queue full, and using DROP algorithm)
-                if(!(s>=_maxSize && _removeAlgorithm==DROP)) {
-                    // add the next item, ensuring we lock
-                    synchronized(this) {
-                        // LinkedList.add() does the same thing, but this ensures behaviour
-                        ((LinkedList) _lists.get(i)).addLast(o);
-                    }
-                }
-                // if the queue was empty before the add it is possible
-                // that a consumer is waiting... so we notify them
                 synchronized(((LinkedList) _lists.get(i))) {
-                    ((LinkedList) _lists.get(i)).notifyAll();
+                    // get size before adding to the Queue
+                    int s = ((LinkedList) _lists.get(i)).size();
+                    // check whether we need to remove an item from the current Queue
+                    if(_maxSize!=-1 && s>=_maxSize && _removeAlgorithm!=DROP) {
+                        // we need to remove an item
+                        removeQueueItem((LinkedList) _lists.get(i));
+                    }
+                    // check if we should add (not if Queue full, and using DROP algorithm)
+                    if(!(s>=_maxSize && _removeAlgorithm==DROP)) {
+                        // add the next item, ensuring we lock
+                        synchronized(this) {
+                            // LinkedList.add() does the same thing, but this ensures behaviour
+                            ((LinkedList) _lists.get(i)).addLast(o);
+                        }
+                        // if the queue was empty before the add it is possible
+                        // that a consumer is waiting... so we notify them
+                        //synchronized(((LinkedList) _lists.get(i))) {
+                            ((LinkedList) _lists.get(i)).notifyAll();
+                        //}
+                    }
                 }
             }
         }