--- projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReader.java 2000/11/29 19:26:00 1.2 +++ projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReader.java 2000/11/30 02:00:54 1.3 @@ -12,6 +12,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import org.omg.CORBA.*; import org.omg.CosNaming.*; +import uk.ac.ukc.iscream.refman.*; /** * A socket listener to listen for new hosts registering with the system. @@ -19,7 +20,7 @@ import org.omg.CosNaming.*; * of the HostInit class, which handles further communication. * * @author $Author: tdb $ - * @version $Id: TCPReader.java,v 1.2 2000/11/29 19:26:00 tdb Exp $ + * @version $Id: TCPReader.java,v 1.3 2000/11/30 02:00:54 tdb Exp $ */ class TCPReader extends Thread { @@ -28,7 +29,7 @@ class TCPReader extends Thread { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.2 $"; + public final String REVISION = "$Revision: 1.3 $"; //---STATIC METHODS--- @@ -41,9 +42,7 @@ class TCPReader extends Thread { * @param configManager a reference to the ConfigurationManager we are using * @param port The port that the server will listen on. */ - public TCPReader(Logger logger, ConfigurationManager configManager, int port, Filter parent) { - _logger = logger; - _configManager = configManager; + public TCPReader(int port, Filter parent) { _port = port; _parent = parent; _logger.write(toString(), Logger.SYSINIT, "started"); @@ -98,7 +97,7 @@ class TCPReader extends Thread { if(run){ try { // Setup the HostInit so it can carry on communications with the host - TCPReaderInit init = new TCPReaderInit(hostSocket, _configManager, _logger, _parent); + TCPReaderInit init = new TCPReaderInit(hostSocket, _parent); // and start it init.start(); } catch (IOException e) { @@ -129,12 +128,7 @@ class TCPReader extends Thread { /** * A reference to the logger the system is using */ - Logger _logger; - - /** - * A reference to the configurator the system is using - */ - ConfigurationManager _configManager; + Logger _logger = ReferenceManager.getInstance().getLogger(); /** * The port on which the server should listen.