geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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<String, ComponentPermissions> contextIdPermissionsMap = new
HashMap<String, ComponentPermissions>();



Mime
View raw message