Author: markt
Date: Sat Jun 13 20:38:46 2009
New Revision: 784467
URL: http://svn.apache.org/viewvc?rev=784467&view=rev
Log:
Fix regression in fix for bug 42707
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java?rev=784467&r1=784466&r2=784467&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
Sat Jun 13 20:38:46 2009
@@ -256,7 +256,7 @@
/**
* Mapper listener.
*/
- protected MapperListener mapperListener = new MapperListener(mapper);
+ protected MapperListener mapperListener = new MapperListener(mapper,
this);
/**
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java?rev=784467&r1=784466&r2=784467&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
Sat Jun 13 20:38:46 2009
@@ -29,7 +29,6 @@
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Host;
-import org.apache.catalina.ServerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,6 +58,11 @@
* Associated mapper.
*/
protected Mapper mapper = null;
+
+ /**
+ * Associated connector.
+ */
+ protected Connector connector = null;
/**
* MBean server.
@@ -82,8 +86,9 @@
/**
* Create mapper listener.
*/
- public MapperListener(Mapper mapper) {
+ public MapperListener(Mapper mapper, Connector connector) {
this.mapper = mapper;
+ this.connector = connector;
}
@@ -326,9 +331,9 @@
String name=objectName.getKeyProperty("host");
if( name != null ) {
- Host host = (Host) ServerFactory.getServer().findService(
- domain).getContainer().findChild(name);
-
+ Host host =
+ (Host) connector.getService().getContainer().findChild(name);
+
String[] aliases = host.findAliases();
mapper.addHost(name, aliases, objectName);
host.addContainerListener(this);
@@ -346,8 +351,8 @@
throws Exception {
String name=objectName.getKeyProperty("host");
if( name != null ) {
- Host host = (Host) ServerFactory.getServer().findService(
- domain).getContainer().findChild(name);
+ Host host =
+ (Host) connector.getService().getContainer().findChild(name);
mapper.removeHost(name);
host.removeContainerListener(this);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
