Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
libtcnative-1-0
tomcat6-bug47316.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File tomcat6-bug47316.patch of Package libtcnative-1-0
Index: apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java =================================================================== --- apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java.orig 2009-05-14 01:15:15.000000000 +0200 +++ apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java 2009-09-30 09:38:48.877844567 +0200 @@ -263,7 +263,7 @@ /** * Mapper listener. */ - protected MapperListener mapperListener = new MapperListener(mapper); + protected MapperListener mapperListener = new MapperListener(mapper, this); /** Index: apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java =================================================================== --- apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java.orig 2009-05-14 01:15:15.000000000 +0200 +++ apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java 2009-09-30 09:48:47.837416209 +0200 @@ -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.catalina.core.StandardContext; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -62,6 +61,11 @@ * Associated mapper. */ protected Mapper mapper = null; + + /** + * Associated connector. + */ + protected Connector connector = null; /** * MBean server. @@ -85,8 +89,9 @@ /** * Create mapper listener. */ - public MapperListener(Mapper mapper) { + public MapperListener(Mapper mapper, Connector connector) { this.mapper = mapper; + this.connector = connector; } @@ -329,9 +334,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); @@ -349,11 +354,13 @@ 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); + if (host != null) { + host.removeContainerListener(this); + } if(log.isDebugEnabled()) log.debug(sm.getString ("mapperListener.unregisterHost", name, domain));
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor