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.12 by ajm, Thu Nov 30 03:16:17 2000 UTC

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

Diff Legend

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