Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72367 invoked from network); 14 Oct 2010 21:24:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Oct 2010 21:24:32 -0000 Received: (qmail 38813 invoked by uid 500); 14 Oct 2010 21:24:32 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 38769 invoked by uid 500); 14 Oct 2010 21:24:32 -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 38762 invoked by uid 99); 14 Oct 2010 21:24:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Oct 2010 21:24:32 +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; Thu, 14 Oct 2010 21:24:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5C93F238890A; Thu, 14 Oct 2010 21:23:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1022724 - /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Date: Thu, 14 Oct 2010 21:23:36 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101014212336.5C93F238890A@eris.apache.org> Author: djencks Date: Thu Oct 14 21:23:35 2010 New Revision: 1022724 URL: http://svn.apache.org/viewvc?rev=1022724&view=rev Log: GERONIMO-5646 if jetty doesn't start a web app, don't start the gbean for it either Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=1022724&r1=1022723&r2=1022724&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Thu Oct 14 21:23:35 2010 @@ -147,6 +147,16 @@ public class GeronimoWebAppContext exten entry.getKey().onStartup(entry.getValue(), getServletContext()); } super.doStart(); + if (!isAvailable()) { + Throwable e = getUnavailableException(); + if (e instanceof Exception) { + throw (Exception)e; + } + if (e instanceof Throwable) { + throw new Exception("Could not start web app", e); + } + throw new Exception("Could not start web app for unknown reason"); + } if (applicationPolicyConfigurationManager != null) { SpecSecurityBuilder specSecurityBuilder = new SpecSecurityBuilder(webSecurityConstraintStore.exportMergedWebAppInfo()); Map contextIdPermissionsMap = new HashMap();