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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.8 by tdb, Wed Nov 29 19:26:00 2000 UTC vs.
Revision 1.9 by ajm, Wed Nov 29 21:27:39 2000 UTC

#	Line 29 | Line 29 | public class FilterThread extends Thread{
29		//---CONSTRUCTORS---
30
31		// Class constructor. Obtains the byte[] from a DatagramPacket.
32	<	public FilterThread(DatagramPacket packet, Filter parent, Logger logger){
32	>	public FilterThread(DatagramPacket packet, String name, Filter parent, Logger logger){
33	>	_name = name;
34		this.parent = parent;
35		this.rawPacket = packet.getData();
36		this.logger = logger;
37	+	logger.write(this.toString(), Logger.DEBUG, "created");
38	+
39		}
40
41		// Class constructor for passing XML Strings.
42	<	public FilterThread(String xml, Filter parent, Logger logger){
42	>	public FilterThread(String xml, String name, Filter parent, Logger logger){
43	>	_name = name;
44	>	this.logger = logger;
45		this.parent = parent;
46		this.rawPacket = xml.getBytes();
47	+	logger.write(this.toString(), Logger.DEBUG, "created");
48		}
49
50		//---PUBLIC METHODS---
#	Line 53 | Line 59 | public class FilterThread extends Thread{
59		else {
60		xml = xml.substring(0, xml.length());
61		}
62	<	//System.out.println(xml);
57	<
62	>
63		// Use my XMLPacketMaker to make an XMLPacket object.
64		XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml, logger);
65		XMLPacket packet = xmlPacketMaker.createXMLPacket();
66	<
66	>
67	>	logger.write(this.toString(), Logger.DEBUG, "got data, filtering and passing to parent - " + packet.printAll());
68	>
69		if (packet == null){
70		// A null XML packet was returned - don't pass it on.
71		logger.write(this.toString(), Logger.SYSMSG, "An XML UDP packet was sucessfully filtered from the system.");
#	Line 78 | Line 85 | public class FilterThread extends Thread{
85		* @return the name of this class and its CVS revision
86		*/
87		public String toString() {
88	<	return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")";
88	>	return this.getClass().getName() + "{" + _name + "}(" + REVISION.substring(11, REVISION.length() - 2) + ")";
89		}
90
91		//---PRIVATE METHODS---
#	Line 90 | Line 97 | public class FilterThread extends Thread{
97		Filter parent;
98		byte[] rawPacket;
99		Logger logger;
100	+	String _name;
101
102		//---STATIC ATTRIBUTES---
103

Diff Legend

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