]>
Commit | Line | Data |
---|---|---|
0caf589a | 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) | |
5 | @@ -263,7 +263,7 @@ | |
6 | /** | |
7 | * Mapper listener. | |
8 | */ | |
9 | - protected MapperListener mapperListener = new MapperListener(mapper); | |
10 | + protected MapperListener mapperListener = new MapperListener(mapper, this); | |
11 | ||
12 | ||
13 | /** | |
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) | |
18 | @@ -29,7 +29,6 @@ | |
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; | |
26 | @@ -62,6 +61,11 @@ | |
27 | * Associated mapper. | |
28 | */ | |
29 | protected Mapper mapper = null; | |
30 | + | |
31 | + /** | |
32 | + * Associated connector. | |
33 | + */ | |
34 | + protected Connector connector = null; | |
35 | ||
36 | /** | |
37 | * MBean server. | |
38 | @@ -85,8 +89,9 @@ | |
39 | /** | |
40 | * Create mapper listener. | |
41 | */ | |
42 | - public MapperListener(Mapper mapper) { | |
43 | + public MapperListener(Mapper mapper, Connector connector) { | |
44 | this.mapper = mapper; | |
45 | + this.connector = connector; | |
46 | } | |
47 | ||
48 | ||
49 | @@ -329,9 +334,9 @@ | |
50 | String name=objectName.getKeyProperty("host"); | |
51 | if( name != null ) { | |
52 | ||
53 | - Host host = (Host) ServerFactory.getServer().findService( | |
54 | - domain).getContainer().findChild(name); | |
55 | - | |
56 | + Host host = | |
57 | + (Host) connector.getService().getContainer().findChild(name); | |
58 | + | |
59 | String[] aliases = host.findAliases(); | |
60 | mapper.addHost(name, aliases, objectName); | |
61 | host.addContainerListener(this); | |
62 | @@ -349,8 +354,8 @@ | |
63 | throws Exception { | |
64 | String name=objectName.getKeyProperty("host"); | |
65 | if( name != null ) { | |
66 | - Host host = (Host) ServerFactory.getServer().findService( | |
67 | - domain).getContainer().findChild(name); | |
68 | + Host host = | |
69 | + (Host) connector.getService().getContainer().findChild(name); | |
70 | ||
71 | mapper.removeHost(name); | |
72 | if (host != null) { |