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.24 by tdb, Mon Feb 12 00:45:57 2001 UTC vs.
Revision 1.26 by tdb, Sat Mar 10 04:03:07 2001 UTC

# Line 53 | Line 53 | public class FilterThread extends Thread{
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
# Line 84 | Line 86 | public class FilterThread extends Thread{
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) {
93 <                // packet is not null
94 <                // packet was not dropped by a plugin
95 <                // ... 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 <                }
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 <                // we had a null
105 <                _logger.write(toString(), Logger.DEBUG, "A 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      }

Diff Legend

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