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. |
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 { |
76 |
|
if (xml.indexOf(0) != -1) { |
77 |
|
xml = xml.substring(0, xml.indexOf(0)); |
78 |
|
} |
77 |
– |
else { |
78 |
– |
xml = xml.substring(0, xml.length()); |
79 |
– |
} |
79 |
|
|
80 |
|
// Bundle the XML all on one line (saves space and simplifies |
81 |
|
// the protocol between clientinterface and client). |
96 |
|
} |
97 |
|
|
98 |
|
// get parent |
100 |
– |
Filter parent; |
99 |
|
try { |
100 |
< |
String parentFilterName = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter"); |
101 |
< |
parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName)); |
100 |
> |
String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter"); |
101 |
> |
if(!parentFilterName.equals(newParent)) { |
102 |
> |
parentFilterName = newParent; |
103 |
> |
parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName)); |
104 |
> |
_logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName); |
105 |
> |
} |
106 |
|
} catch (PropertyNotFoundException e) { |
107 |
|
continue; |
108 |
|
} |
123 |
|
* Overrides the {@link java.lang.Object#toString() Object.toString()} |
124 |
|
* method to provide clean logging (every class should have this). |
125 |
|
* |
126 |
< |
* This uses the uk.ac.ukc.iscream.util.NameFormat class |
126 |
> |
* This uses the uk.org.iscream.cms.server.util.NameFormat class |
127 |
|
* to format the toString() |
128 |
|
* |
129 |
|
* @return the name of this class and its CVS revision |