--- experimental/server/Queue/Consumer.java	2000/12/28 03:51:03	1.2
+++ experimental/server/Queue/Consumer.java	2001/01/02 01:54:19	1.3
@@ -1,31 +1,39 @@
 class Consumer extends Thread {
     
-    public Consumer(Queue queue, long sleepTime) {
+    public Consumer(Queue queue, long sleepTime, int repititions) {
         _queue = queue;
         _sleepTime = sleepTime;
+        _repititions = repititions;
     }
     
     public void run() {
-        boolean run;
-        try {
-            _n = _queue.getQueue();
-            System.out.println("Got queue: "+_n);
-            run = true;
-        }
-        catch(NoQueueException e) {
-            System.out.println("Failed to get a Queue:");
-            System.out.println(e);
-            run=false;
-        }
+        boolean run = true;
+        _n = _queue.getQueue();
+        System.out.println("Got queue: "+_n);
+        String s = null;
+        int i = 0;
         while(run) {
             try { Thread.sleep(_sleepTime); } catch(Exception e) {}
-            String s = (String) _queue.get(_n);
+            try {
+                s = (String) _queue.get(_n);
+            }
+            catch(InvalidQueueException e) {
+                System.out.println(e);
+                run=false;
+            }
             System.out.println("["+_n+"] "+s);
+            i++;
+            if(i==_repititions) {
+                run = false;
+            }
         }
+        System.out.println("Closing down, and releasing queue "+_n);
+        _queue.removeQueue(_n);
     }
     
     private Queue _queue;
     private int _n;
     private long _sleepTime;
+    private int _repititions;
     
 }
\ No newline at end of file