Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7E3A17A27 for ; Wed, 24 Jun 2015 13:40:35 +0000 (UTC) Received: (qmail 98829 invoked by uid 500); 24 Jun 2015 13:40:35 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 98750 invoked by uid 500); 24 Jun 2015 13:40:35 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 98740 invoked by uid 99); 24 Jun 2015 13:40:35 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 13:40:35 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 26AAEAC062D for ; Wed, 24 Jun 2015 13:40:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1687268 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Date: Wed, 24 Jun 2015 13:40:35 -0000 To: dev@tomcat.apache.org From: violetagg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150624134035.26AAEAC062D@hades.apache.org> Author: violetagg Date: Wed Jun 24 13:40:34 2015 New Revision: 1687268 URL: http://svn.apache.org/r1687268 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57700 ADD_CHILD_EVENT must be sent even when there are failures during child's start, thus MapperListener will be added as Container/Lifecycle Listener and will be able to receive events related to the corresponding Container. Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1687268&r1=1687267&r2=1687268&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Jun 24 13:40:34 2015 @@ -717,19 +717,18 @@ public abstract class ContainerBase exte // Start child // Don't do this inside sync block - start can be a slow process and // locking the children object can cause problems elsewhere - if ((getState().isAvailable() || - LifecycleState.STARTING_PREP.equals(getState())) && - startChildren) { - try { + try { + if ((getState().isAvailable() || + LifecycleState.STARTING_PREP.equals(getState())) && + startChildren) { child.start(); - } catch (LifecycleException e) { - log.error("ContainerBase.addChild: start: ", e); - throw new IllegalStateException - ("ContainerBase.addChild: start: " + e); } + } catch (LifecycleException e) { + log.error("ContainerBase.addChild: start: ", e); + throw new IllegalStateException("ContainerBase.addChild: start: " + e); + } finally { + fireContainerEvent(ADD_CHILD_EVENT, child); } - - fireContainerEvent(ADD_CHILD_EVENT, child); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org