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.29 by tdb, Wed Mar 14 23:25:29 2001 UTC vs.
Revision 1.38 by tdb, Sat Oct 12 22:12:36 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.org.iscream.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25   import java.io.*;
26   import java.net.*;
27   import java.util.*;
28 < import uk.org.iscream.core.*;
29 < import uk.org.iscream.componentmanager.*;
30 < import uk.org.iscream.filter.*;
31 < import uk.org.iscream.util.*;
28 > import uk.org.iscream.cms.server.core.*;
29 > import uk.org.iscream.cms.server.componentmanager.*;
30 > import uk.org.iscream.cms.server.filter.*;
31 > import uk.org.iscream.cms.server.util.*;
32  
33   /**
34   * Handle an incoming packet as a separate thread.
# Line 54 | Line 74 | public class FilterThread extends Thread{
74       * sending it on to the parent filter.
75       */
76      public void run(){
57 –        // setup the XMLPacketMaker
58 –        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
77          // get a queue for ourselves
78          int n = _queue.getQueue();
79          // keep these out here, saves recreating the object
80          String xml = null;
81 +        String parentFilterName = "";
82 +        Filter parent = null;
83          while(true) {
84              // get a String of xml
85              try {
# Line 74 | Line 94 | public class FilterThread extends Thread{
94              if (xml.indexOf(0) != -1) {
95                  xml = xml.substring(0, xml.indexOf(0));
96              }
77 –            else {
78 –                xml = xml.substring(0, xml.length());
79 –            }
97              
98              // Bundle the XML all on one line (saves space and simplifies
99              // the protocol between clientinterface and client).
# Line 86 | Line 103 | public class FilterThread extends Thread{
103                  xml += tokenizer.nextToken();
104              }
105              
106 <            // Use XMLPacketMaker to make an XMLPacket object.
106 >            // Get an XMLPacket from the XMLCache.
107              XMLPacket packet = null;
108              try {
109 <                packet = xmlPacketMaker.createXMLPacket(xml);
109 >                packet = _xmlCache.getXMLPacket(xml);
110              } catch(InvalidXMLException e) {
111                  _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
112                  // skip the rest of this loop iteration
# Line 97 | Line 114 | public class FilterThread extends Thread{
114              }
115              
116              // get parent
100 –            Filter parent;
117              try {
118 <                String parentFilterName = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter");
119 <                parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
118 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
119 >                if(!parentFilterName.equals(newParent)) {
120 >                    parentFilterName = newParent;
121 >                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter\\." + parentFilterName));
122 >                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
123 >                }
124              } catch (PropertyNotFoundException e) {
125                  continue;
126              }
# Line 121 | Line 141 | public class FilterThread extends Thread{
141       * Overrides the {@link java.lang.Object#toString() Object.toString()}
142       * method to provide clean logging (every class should have this).
143       *
144 <     * This uses the uk.org.iscream.util.NameFormat class
144 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
145       * to format the toString()
146       *
147       * @return the name of this class and its CVS revision
# Line 165 | Line 185 | public class FilterThread extends Thread{
185       * A reference to the reference manager in use
186       */
187      private ReferenceManager _refman = ReferenceManager.getInstance();
188 +    
189 +    /**
190 +     * A reference to the XMLCache in use
191 +     */
192 +    private XMLCache _xmlCache = XMLCache.getInstance();
193  
194   //---STATIC ATTRIBUTES---
195  

Diff Legend

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