From 2b21975ab12d2075451ee56badefc3d0862f061d Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 5 Mar 2010 12:38:02 +0000 Subject: [PATCH] 292799 - WebAppDeployer - start a started context? git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1345 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 87b1074c82c..2ca7ba149a7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.0.2-SNAPSHOT + JSON parses NaN as null + 290765 Reset input for HttpExchange retry. + + 292799 WebAppDeployer - start a started context? + 294799 when configuring a webapp, don't look for WEB-INF/jetty6-web.xml + 296569 removeLifeCycleListener() has no effect + 296765 JMX Connector Server and ShutdownThread diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java index 73b7e184c1e..a76e3491a1a 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java @@ -295,7 +295,7 @@ public class WebAppDeployer extends AbstractLifeCycle _deployed.add(wah); if (_contexts.isStarted()) - _contexts.start(); // TODO Multi exception + wah.start(); // TODO Multi exception } }