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
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.20 by pjm2, Sun Feb 11 21:05:34 2001 UTC vs.
Revision 1.27 by tdb, Tue Mar 13 02:19:46 2001 UTC

# Line 41 | Line 41 | public class FilterThread extends Thread{
41       * @param parent a CORBA reference to our parent filter
42       */
43      public FilterThread(Queue queue, Filter parent){
44 +        // set the Thread name
45 +        setName("filter.FilterThread");
46 +        
47          _parent = parent;
48          _queue = queue;
49          _logger.write(toString(), Logger.SYSINIT, "created");
# Line 53 | Line 56 | public class FilterThread extends Thread{
56       * sending it on to the parent filter.
57       */
58      public void run(){
59 +        // setup the XMLPacketMaker
60 +        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
61          // get a queue for ourselves
62          int n = _queue.getQueue();
63          // keep these out here, saves recreating the object
# Line 84 | Line 89 | public class FilterThread extends Thread{
89              }
90              
91              // Use XMLPacketMaker to make an XMLPacket object.
92 <            XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
93 <            XMLPacket packet = xmlPacketMaker.createXMLPacket();
94 <                  
95 <            if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) {
96 <                // packet is not null
97 <                // packet was not dropped by a plugin
98 <                // ... best pass it on !
92 >            XMLPacket packet = null;
93 >            try {
94 >                packet = xmlPacketMaker.createXMLPacket(xml);
95 >            } catch(InvalidXMLException e) {
96 >                _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
97 >                // skip the rest of this loop iteration
98 >                continue;
99 >            }
100 >                              
101 >            // XMLPacket is ok, so run filters...
102 >            if(PluginFilterManager.getInstance().runFilters(packet)) {
103 >                // and pass it on...
104                  _parent.receiveXML(xml);
105              }
106              else {
107 <                // either we had a null, or a plugin dropped it
108 <                _logger.write(toString(), Logger.DEBUG, "A UDP packet containing ill-parsing XML was rejected.");
107 >                // ... or filtered it
108 >                _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
109              }
110          }
111      }

Diff Legend

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