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.18 by tdb, Sun Jan 28 05:25:43 2001 UTC vs.
Revision 1.25 by tdb, Thu Mar 1 16:53:24 2001 UTC

#	Line 43 | Line 43 | public class FilterThread extends Thread{
43		public FilterThread(Queue queue, Filter parent){
44		_parent = parent;
45		_queue = queue;
46	<	_logger.write(toString(), Logger.DEBUG, "created");
46	>	_logger.write(toString(), Logger.SYSINIT, "created");
47		}
48
49		//---PUBLIC METHODS---
#	Line 84 | Line 84 | public class FilterThread extends Thread{
84		}
85
86		// Use XMLPacketMaker to make an XMLPacket object.
87	<	XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
88	<	XMLPacket packet = xmlPacketMaker.createXMLPacket();
89	<
90	<	if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) {
91	<	// packet is not null
92	<	// packet was not dropped by a plugin
93	<	// ... best pass it on !
87	>	XMLPacket packet = null;
88	>	try {
89	>	XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
90	>	packet = xmlPacketMaker.createXMLPacket();
91	>	} catch(InvalidXMLException e) {
92	>	_logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
93	>	// skip the rest of this loop iteration
94	>	continue;
95	>	}
96	>
97	>	// XMLPacket is ok, so run filters...
98	>	if(PluginFilterManager.getInstance().runFilters(packet)) {
99	>	// and pass it on...
100		_parent.receiveXML(xml);
101		}
102		else {
103	<	// either we had a null, or a plugin dropped it
103	>	// ... or filtered it
104		_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
105		}
106		}

Diff Legend

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