1 Index: java/org/apache/catalina/connector/Connector.java
2 ===================================================================
3 --- java/org/apache/catalina/connector/Connector.java (revision 782071)
4 +++ java/org/apache/catalina/connector/Connector.java (working copy)
9 - protected MapperListener mapperListener = new MapperListener(mapper);
10 + protected MapperListener mapperListener = new MapperListener(mapper, this);
14 Index: java/org/apache/catalina/connector/MapperListener.java
15 ===================================================================
16 --- java/org/apache/catalina/connector/MapperListener.java (revision 782071)
17 +++ java/org/apache/catalina/connector/MapperListener.java (working copy)
19 import org.apache.catalina.ContainerEvent;
20 import org.apache.catalina.ContainerListener;
21 import org.apache.catalina.Host;
22 -import org.apache.catalina.ServerFactory;
23 import org.apache.catalina.core.StandardContext;
24 import org.apache.juli.logging.Log;
25 import org.apache.juli.logging.LogFactory;
29 protected Mapper mapper = null;
32 + * Associated connector.
34 + protected Connector connector = null;
40 * Create mapper listener.
42 - public MapperListener(Mapper mapper) {
43 + public MapperListener(Mapper mapper, Connector connector) {
45 + this.connector = connector;
50 String name=objectName.getKeyProperty("host");
53 - Host host = (Host) ServerFactory.getServer().findService(
54 - domain).getContainer().findChild(name);
57 + (Host) connector.getService().getContainer().findChild(name);
59 String[] aliases = host.findAliases();
60 mapper.addHost(name, aliases, objectName);
61 host.addContainerListener(this);
64 String name=objectName.getKeyProperty("host");
66 - Host host = (Host) ServerFactory.getServer().findService(
67 - domain).getContainer().findChild(name);
69 + (Host) connector.getService().getContainer().findChild(name);
71 mapper.removeHost(name);