316413 - Restarting webapp for packed war fails
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1982 7e9141cc-0065-0410-87d8-b60c137991c4
diff --git a/VERSION.txt b/VERSION.txt
index d127dd5..d2670d4 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -23,6 +23,7 @@
+ 316254 Implement @DeclareRoles
+ 316334 Breaking change on org.eclipse.jetty.client.HttpExchange
+ 316399 Debug output in MultiPartFilter
+ + 316413 Restarting webapp for packed war fails
+ JETTY-547 Delay close after shutdown until request read
+ JETTY-1231 Support context request log handler
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
index b008ee3..37c6637 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -360,6 +360,7 @@
public void unpack (WebAppContext context) throws IOException
{
Resource web_app = context.getBaseResource();
+ _preUnpackBaseResource = context.getBaseResource();
if (web_app == null)
{
@@ -461,7 +462,7 @@
Log.debug("webapp=" + web_app);
}
- _preUnpackBaseResource = context.getBaseResource();
+
// Do we need to extract WEB-INF/lib?
Resource web_inf= web_app.addPath("WEB-INF/");
