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.9 by ajm, Wed Nov 29 21:27:39 2000 UTC vs.
Revision 1.10 by tdb, Thu Nov 30 02:00:54 2000 UTC

#	Line 8 | Line 8 | import java.util.*;
8		import uk.ac.ukc.iscream.core.*;
9		import uk.ac.ukc.iscream.filter.*;
10		import uk.ac.ukc.iscream.xml.*;
11	+	import uk.ac.ukc.iscream.refman.*;
12
13		/**
14		* Handle an incoming UDP packet as a separate thread.
#	Line 29 | Line 30 | public class FilterThread extends Thread{
30		//---CONSTRUCTORS---
31
32		// Class constructor. Obtains the byte[] from a DatagramPacket.
33	<	public FilterThread(DatagramPacket packet, String name, Filter parent, Logger logger){
34	<	_name = name;
35	<	this.parent = parent;
36	<	this.rawPacket = packet.getData();
36	<	this.logger = logger;
37	<	logger.write(this.toString(), Logger.DEBUG, "created");
33	>	public FilterThread(DatagramPacket packet, Filter parent){
34	>	_parent = parent;
35	>	_rawPacket = packet.getData();
36	>	_logger.write(this.toString(), Logger.DEBUG, "created");
37
38		}
39
40		// Class constructor for passing XML Strings.
41	<	public FilterThread(String xml, String name, Filter parent, Logger logger){
42	<	_name = name;
43	<	this.logger = logger;
44	<	this.parent = parent;
46	<	this.rawPacket = xml.getBytes();
47	<	logger.write(this.toString(), Logger.DEBUG, "created");
41	>	public FilterThread(String xml, Filter parent){
42	>	_parent = parent;
43	>	_rawPacket = xml.getBytes();
44	>	_logger.write(this.toString(), Logger.DEBUG, "created");
45		}
46
47		//---PUBLIC METHODS---
#	Line 52 | Line 49 | public class FilterThread extends Thread{
49		public void run(){
50
51		// Get a string without any null characters in it.
52	<	String xml = new String(rawPacket);
52	>	//  -- maybe String.trim() would be better here ?
53	>	String xml = new String(_rawPacket);
54		if (xml.indexOf(0) != -1) {
55		xml = xml.substring(0, xml.indexOf(0));
56		}
#	Line 61 | Line 59 | public class FilterThread extends Thread{
59		}
60
61		// Use my XMLPacketMaker to make an XMLPacket object.
62	<	XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml, logger);
62	>	XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
63		XMLPacket packet = xmlPacketMaker.createXMLPacket();
64
65	<	logger.write(this.toString(), Logger.DEBUG, "got data, filtering and passing to parent - " + packet.printAll());
65	>	_logger.write(this.toString(), Logger.DEBUG, "got data, filtering and passing to parent - " + packet.printAll());
66
67		if (packet == null){
68		// A null XML packet was returned - don't pass it on.
69	<	logger.write(this.toString(), Logger.SYSMSG, "An XML UDP packet was sucessfully filtered from the system.");
69	>	_logger.write(this.toString(), Logger.SYSMSG, "An XML UDP packet was sucessfully filtered from the system.");
70		return;
71		}
72
73		// Now do something with this XMLPacket!!!
74		// .... let's try this...
75	<	parent.receiveXML(xml);
75	>	_parent.receiveXML(xml);
76
77		}
78
#	Line 94 | Line 92 | public class FilterThread extends Thread{
92
93		//---ATTRIBUTES---
94
95	<	Filter parent;
96	<	byte[] rawPacket;
97	<	Logger logger;
98	<	String _name;
95	>	Filter _parent;
96	>	byte[] _rawPacket;
97	>	Logger _logger = ReferenceManager.getInstance().getLogger();
98	>	String _name = ReferenceManager.getInstance().getName();
99
100		//---STATIC ATTRIBUTES---
101

Diff Legend

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