--- projects/cms/source/conient/uk/org/iscream/cms/conient/DataReader.java	2001/01/20 16:06:53	1.5
+++ projects/cms/source/conient/uk/org/iscream/cms/conient/DataReader.java	2001/01/22 03:03:39	1.6
@@ -9,7 +9,7 @@ import uk.ac.ukc.iscream.util.*;
  * in for anything that wants it.
  *
  * @author  $Author: ajm $
- * @version $Id: DataReader.java,v 1.5 2001/01/20 16:06:53 ajm Exp $
+ * @version $Id: DataReader.java,v 1.6 2001/01/22 03:03:39 ajm Exp $
  */
 public class DataReader extends Thread {
 
@@ -18,7 +18,7 @@ public class DataReader extends Thread {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.5 $";
+    public final String REVISION = "$Revision: 1.6 $";
    
 //---STATIC METHODS---
 
@@ -32,15 +32,18 @@ public class DataReader extends Thread {
 //---PUBLIC METHODS---
 
     public void run() {
-        boolean running = true;
         try {
-            while (true) {
+        
+            while (_running) {
                 _dataQueue.add(_inBound.readLine());
-                            }
+            }
+        
+            //tidy up some stuff here at some point
+            _inBound.close();
+        
         } catch (IOException e) {
-                System.err.println("This DataReader thread has been shut down as an exception occured: "+e);
-                running = false;
-                return;
+                SwingClient.addMessage("Data Channel Shutdown: reason - "+e);
+                _running = false;
         }
     }
 
@@ -48,11 +51,15 @@ public class DataReader extends Thread {
 
 //---ACCESSOR/MUTATOR METHODS---
 
+    public void setRunning(boolean running) {
+        _running = running;
+    }
+
 //---ATTRIBUTES---
 
     BufferedReader _inBound;
     Queue _dataQueue;
-
+    boolean _running = true;    
 //---STATIC ATTRIBUTES---
 
 }