53 |
|
* sending it on to the parent filter. |
54 |
|
*/ |
55 |
|
public void run(){ |
56 |
+ |
// setup the XMLPacketMaker |
57 |
+ |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(); |
58 |
|
// get a queue for ourselves |
59 |
|
int n = _queue.getQueue(); |
60 |
|
// keep these out here, saves recreating the object |
86 |
|
} |
87 |
|
|
88 |
|
// Use XMLPacketMaker to make an XMLPacket object. |
89 |
< |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml); |
90 |
< |
XMLPacket packet = xmlPacketMaker.createXMLPacket(); |
91 |
< |
|
92 |
< |
if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) { |
93 |
< |
// packet is not null |
94 |
< |
// packet was not dropped by a plugin |
95 |
< |
// ... best pass it on ! |
89 |
> |
XMLPacket packet = null; |
90 |
> |
try { |
91 |
> |
packet = xmlPacketMaker.createXMLPacket(xml); |
92 |
> |
} catch(InvalidXMLException e) { |
93 |
> |
_logger.write(toString(), Logger.ERROR, "Invalid XML: "+e); |
94 |
> |
// skip the rest of this loop iteration |
95 |
> |
continue; |
96 |
> |
} |
97 |
> |
|
98 |
> |
// XMLPacket is ok, so run filters... |
99 |
> |
if(PluginFilterManager.getInstance().runFilters(packet)) { |
100 |
> |
// and pass it on... |
101 |
|
_parent.receiveXML(xml); |
102 |
|
} |
103 |
|
else { |
104 |
< |
// either we had a null, or a plugin dropped it |
105 |
< |
_logger.write(toString(), Logger.DEBUG, "An XML packet containing ill-parsing XML was rejected."); |
104 |
> |
// ... or filtered it |
105 |
> |
_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system."); |
106 |
|
} |
107 |
|
} |
108 |
|
} |