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.28 by tdb, Tue Mar 13 16:25:57 2001 UTC vs.
Revision 1.33 by tdb, Wed Mar 20 13:05:49 2002 UTC

#	Line 1 | Line 1
1		//---PACKAGE DECLARATION---
2	<	package uk.ac.ukc.iscream.filter;
2	>	package uk.org.iscream.cms.server.filter;
3
4		//---IMPORTS---
5		import java.io.*;
6		import java.net.*;
7		import java.util.*;
8	<	import uk.ac.ukc.iscream.core.*;
9	<	import uk.ac.ukc.iscream.componentmanager.*;
10	<	import uk.ac.ukc.iscream.filter.*;
11	<	import uk.ac.ukc.iscream.util.*;
8	>	import uk.org.iscream.cms.server.core.*;
9	>	import uk.org.iscream.cms.server.componentmanager.*;
10	>	import uk.org.iscream.cms.server.filter.*;
11	>	import uk.org.iscream.cms.server.util.*;
12
13		/**
14		* Handle an incoming packet as a separate thread.
#	Line 60 | Line 60 | public class FilterThread extends Thread{
60		int n = _queue.getQueue();
61		// keep these out here, saves recreating the object
62		String xml = null;
63	+	String parentFilterName = "";
64	+	Filter parent = null;
65		while(true) {
66		// get a String of xml
67		try {
#	Line 97 | Line 99 | public class FilterThread extends Thread{
99		}
100
101		// get parent
100	–	Filter parent;
102		try {
103	<	String parentFilterName = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter");
104	<	parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
103	>	String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
104	>	if(!parentFilterName.equals(newParent)) {
105	>	parentFilterName = newParent;
106	>	parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
107	>	_logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
108	>	}
109		} catch (PropertyNotFoundException e) {
110		continue;
111		}
#	Line 121 | Line 126 | public class FilterThread extends Thread{
126		* Overrides the {@link java.lang.Object#toString() Object.toString()}
127		* method to provide clean logging (every class should have this).
128		*
129	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
129	>	* This uses the uk.org.iscream.cms.server.util.NameFormat class
130		* to format the toString()
131		*
132		* @return the name of this class and its CVS revision

Diff Legend

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