Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 9439 invoked from network); 3 Jul 2009 00:06:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Jul 2009 00:06:17 -0000 Received: (qmail 35069 invoked by uid 500); 3 Jul 2009 00:06:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35004 invoked by uid 500); 3 Jul 2009 00:06:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 34995 invoked by uid 99); 3 Jul 2009 00:06:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2009 00:06:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2009 00:06:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2D12123888CC; Fri, 3 Jul 2009 00:06:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790765 - in /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector: Connector.java MapperListener.java Date: Fri, 03 Jul 2009 00:06:03 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090703000603.2D12123888CC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kevan Date: Fri Jul 3 00:06:02 2009 New Revision: 790765 URL: http://svn.apache.org/viewvc?rev=790765&view=rev Log: GERONIMO-4685 Merge of 783305 from tomcat/tc6.0.x/trunk/. Fixes NPE in MapperListener.registerHost(). I would expect that this fix would be in 6.0.22. So prolly won't require merging in the future Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/Connector.java geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/MapperListener.java Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/Connector.java?rev=790765&r1=790764&r2=790765&view=diff ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/Connector.java (original) +++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/Connector.java Fri Jul 3 00:06:02 2009 @@ -263,7 +263,7 @@ /** * Mapper listener. */ - protected MapperListener mapperListener = new MapperListener(mapper); + protected MapperListener mapperListener = new MapperListener(mapper, this); /** Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/MapperListener.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/MapperListener.java?rev=790765&r1=790764&r2=790765&view=diff ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/MapperListener.java (original) +++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/MapperListener.java Fri Jul 3 00:06:02 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.catalina.core.StandardContext; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -64,6 +63,11 @@ protected Mapper mapper = null; /** + * Associated connector. + */ + protected Connector connector = null; + + /** * MBean server. */ protected MBeanServer mBeanServer = null; @@ -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,8 +354,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);