ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/util/uk/org/iscream/cms/util/Queue.java
(Generate patch)

Comparing projects/cms/source/util/uk/org/iscream/cms/util/Queue.java (file contents):
Revision 1.17 by tdb, Fri Mar 16 15:17:06 2001 UTC vs.
Revision 1.20 by tdb, Mon Mar 26 17:59:47 2001 UTC

# Line 97 | Line 97 | public class Queue {
97                  // get size before adding to the Queue
98                  int s = ((LinkedList) _lists.get(i)).size();
99                  // check whether we need to remove an item from the current Queue
100 <                if(_maxSize!=-1 && s==_maxSize && _removeAlgorithm!=DROP) {
100 >                if(_maxSize!=-1 && s>=_maxSize && _removeAlgorithm!=DROP) {
101                      // we need to remove an item
102                      removeQueueItem((LinkedList) _lists.get(i));
103                  }
104                  // check if we should add (not if Queue full, and using DROP algorithm)
105 <                if(!(s==_maxSize && _removeAlgorithm==DROP)) {
105 >                if(!(s>=_maxSize && _removeAlgorithm==DROP)) {
106                      // add the next item, ensuring we lock
107                      synchronized(this) {
108                          // LinkedList.add() does the same thing, but this ensures behaviour
# Line 111 | Line 111 | public class Queue {
111                  }
112                  // if the queue was empty before the add it is possible
113                  // that a consumer is waiting... so we notify them
114 <                if (s == 0) {
115 <                    synchronized(((LinkedList) _lists.get(i))) {
116 <                        ((LinkedList) _lists.get(i)).notifyAll();
117 <                    }
114 >                synchronized(((LinkedList) _lists.get(i))) {
115 >                    ((LinkedList) _lists.get(i)).notifyAll();
116                  }
117              }
118          }
# Line 136 | Line 134 | public class Queue {
134              throw new InvalidQueueException("Requested queue "+queue+" does not exist");
135          }
136          // block if the queue is empty
137 <        if (((LinkedList) _lists.get(queue)).size() == 0) {
138 <            synchronized(((LinkedList) _lists.get(queue))) {
137 >        synchronized(((LinkedList) _lists.get(queue))) {
138 >            if (((LinkedList) _lists.get(queue)).size() == 0) {
139                  try { ((LinkedList) _lists.get(queue)).wait(); } catch(Exception e) {}
140              }
141          }
# Line 247 | Line 245 | public class Queue {
245       *
246       * @return An integer to be passed to the get() method.
247       */
248 <    public int getQueue() {
248 >    public synchronized int getQueue() {
249          int pos = -1;
250          for(int i=0; i < _lists.size(); i++) {
251              if(_lists.get(i) == null) {
# Line 271 | Line 269 | public class Queue {
269       *
270       * @param queue The integer identifier for the queue, given by getQueue().
271       */
272 <    public void removeQueue(int queue) {
272 >    public synchronized void removeQueue(int queue) {
273          _lists.set(queue, null);
274      }
275      

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines