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/TCPReaderInit.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java (file contents):
Revision 1.23 by tdb, Tue Mar 13 16:46:13 2001 UTC vs.
Revision 1.26 by tdb, Thu Mar 21 13:01:21 2002 UTC

#	Line 1 | Line 1
1		//---PACKAGE DECLARATION---
2	<	package uk.ac.ukc.iscream.filter;
2	>	package uk.org.iscream.cms.server.filter;
3
4		//---IMPORTS---
5	<	import uk.ac.ukc.iscream.core.*;
6	<	import uk.ac.ukc.iscream.filter.*;
7	<	import uk.ac.ukc.iscream.componentmanager.*;
5	>	import uk.org.iscream.cms.server.core.*;
6	>	import uk.org.iscream.cms.server.filter.*;
7	>	import uk.org.iscream.cms.server.componentmanager.*;
8		import java.net.Socket;
9		import java.io.InputStream;
10		import java.io.OutputStream;
11		import java.io.IOException;
12		import java.io.*;
13	<	import uk.ac.ukc.iscream.util.*;
13	>	import uk.org.iscream.cms.server.util.*;
14
15		/**
16		* This provides Host heartbeat functionality
#	Line 127 | Line 127 | class TCPReaderInit extends Thread {
127		* Overrides the {@link java.lang.Object#toString() Object.toString()}
128		* method to provide clean logging (every class should have this).
129		*
130	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
130	>	* This uses the uk.org.iscream.cms.server.util.NameFormat class
131		* to format the toString()
132		*
133		* @return the name of this class and its CVS revision
#	Line 146 | Line 146 | class TCPReaderInit extends Thread {
146		String inBound = getInBound();
147		// check if it's what we're expecting
148		if(!inBound.equals(expected)) {
149	<	throw new IOException("protocol error - expected:"+expected+" got:" + inBound);
149	>	throw new IOException("protocol error from "+_socket.getInetAddress().getHostName()+" - expected:"+expected+" got:" + inBound);
150		}
151		// it should be ok then
152		return inBound;

Diff Legend

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