ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReader.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReader.java (file contents):
Revision 1.2 by tdb, Wed Nov 29 19:26:00 2000 UTC vs.
Revision 1.3 by tdb, Thu Nov 30 02:00:54 2000 UTC

#	Line 12 | Line 12 | import java.net.InetAddress;
12		import java.net.UnknownHostException;
13		import org.omg.CORBA.*;
14		import org.omg.CosNaming.*;
15	+	import uk.ac.ukc.iscream.refman.*;
16
17		/**
18		* A socket listener to listen for new hosts registering with the system.
#	Line 41 | Line 42 | class TCPReader extends Thread {
42		* @param configManager a reference to the ConfigurationManager we are using
43		* @param port The port that the server will listen on.
44		*/
45	<	public TCPReader(Logger logger, ConfigurationManager configManager, int port, Filter parent) {
45	<	_logger = logger;
46	<	_configManager = configManager;
45	>	public TCPReader(int port, Filter parent) {
46		_port = port;
47		_parent = parent;
48		_logger.write(toString(), Logger.SYSINIT, "started");
#	Line 98 | Line 97 | class TCPReader extends Thread {
97		if(run){
98		try {
99		// Setup the HostInit so it can carry on communications with the host
100	<	TCPReaderInit init = new TCPReaderInit(hostSocket, _configManager, _logger, _parent);
100	>	TCPReaderInit init = new TCPReaderInit(hostSocket, _parent);
101		// and start it
102		init.start();
103		} catch (IOException e) {
#	Line 129 | Line 128 | class TCPReader extends Thread {
128		/**
129		* A reference to the logger the system is using
130		*/
131	<	Logger _logger;
133	<
134	<	/**
135	<	* A reference to the configurator the system is using
136	<	*/
137	<	ConfigurationManager _configManager;
131	>	Logger _logger = ReferenceManager.getInstance().getLogger();
132
133		/**
134		* The port on which the server should listen.

Diff Legend

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