--- projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java	2000/11/29 21:27:39	1.7
+++ projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java	2000/11/30 02:00:55	1.8
@@ -11,13 +11,14 @@ import java.io.IOException;
 import java.io.*;
 import org.omg.CORBA.*;
 import org.omg.CosNaming.*;
+import uk.ac.ukc.iscream.refman.*;
 
 /**
  * <ONE LINE DESCRIPTION>
  * <DETAILED DESCRIPTION>
  *
- * @author  $Author: ajm $
- * @version $Id: TCPReaderInit.java,v 1.7 2000/11/29 21:27:39 ajm Exp $
+ * @author  $Author: tdb $
+ * @version $Id: TCPReaderInit.java,v 1.8 2000/11/30 02:00:55 tdb Exp $
  */
 class TCPReaderInit extends Thread {
 
@@ -26,25 +27,22 @@ class TCPReaderInit extends Thread {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.7 $";
+    public final String REVISION = "$Revision: 1.8 $";
     
 //---STATIC METHODS---
 
 //---CONSTRUCTORS---
 
-    public TCPReaderInit(Socket socket, ConfigurationManager configManager, Logger logRef, Filter parent) throws IOException {
-        _configManager = configManager;
-        _logRef = logRef;
+    public TCPReaderInit(Socket socket, Filter parent) throws IOException {
         _socket = socket;
         _parent = parent;
         _socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
         _socketOut = new PrintWriter(_socket.getOutputStream());
-        _logRef.write(toString(), Logger.SYSINIT, "created");
+        _logger.write(toString(), Logger.SYSINIT, "created");
     }
     
 //---PUBLIC METHODS---
 
-    //NEED TO MAJORILY CHANGE THIS BIT !
     public void run() {
         try {
             //variables
@@ -105,11 +103,11 @@ class TCPReaderInit extends Thread {
             String ipadd = _socket.getInetAddress().getHostAddress();
             String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>";
             
-            FilterThread t = new FilterThread(xml, null, _parent, _logRef);
+            FilterThread t = new FilterThread(xml, _parent);
             t.start();
             
         } catch (Exception e) {
-            _logRef.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
+            _logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
         }
         
         _socketOut.flush();
@@ -119,9 +117,9 @@ class TCPReaderInit extends Thread {
             _socketOut.close();
             _socket.close();
         } catch (IOException e) {
-            _logRef.write(toString(), Logger.ERROR, "exception on socket close");
+            _logger.write(toString(), Logger.ERROR, "exception on socket close");
         }
-        _logRef.write(toString(), Logger.SYSMSG, "finished");
+        _logger.write(toString(), Logger.SYSMSG, "finished");
     }
     
     /**
@@ -142,8 +140,8 @@ class TCPReaderInit extends Thread {
 
 //---ATTRIBUTES---
 
-    ConfigurationManager _configManager;
-    Logger _logRef;
+    ConfigurationManager _configManager = ReferenceManager.getInstance().getCM();
+    Logger _logger = ReferenceManager.getInstance().getLogger();
     Socket _socket;
     BufferedReader _socketIn;
     PrintWriter _socketOut;