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.24 by tdb, Mon Feb 12 00:45:57 2001 UTC vs.
Revision 1.25 by tdb, Thu Mar 1 16:53:24 2001 UTC

#	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) {
91	<	// packet is not null
92	<	// packet was not dropped by a plugin
93	<	// ... best pass it on !
94	<	if(PluginFilterManager.getInstance().runFilters(packet)) {
95	<	_parent.receiveXML(xml);
96	<	}
97	<	else {
98	<	// we filtered it
99	<	_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
100	<	}
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	<	// we had a null
104	<	_logger.write(toString(), Logger.DEBUG, "A packet containing ill-parsing XML was rejected.");
103	>	// ... or filtered it
104	>	_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
105		}
106		}
107		}

Diff Legend

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