From c9c56853b599fb51bcddd5d24488acaf7e894abf Mon Sep 17 00:00:00 2001
From: Jan Bartel <jan@webtide.com>
Date: Thu, 10 Jun 2010 04:18:57 +0000
Subject: [PATCH] 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
---
 VERSION.txt                                                    | 1 +
 .../java/org/eclipse/jetty/webapp/WebInfConfiguration.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index d127dd5447f..d2670d48fbb 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -23,6 +23,7 @@ jetty-7.1.4.v20100609
  + 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 b008ee3c72a..37c663715a6 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 class WebInfConfiguration implements Configuration
     public void unpack (WebAppContext context) throws IOException
     {
         Resource web_app = context.getBaseResource();
+        _preUnpackBaseResource = context.getBaseResource();
         
         if (web_app == null)
         {
@@ -461,7 +462,7 @@ public class WebInfConfiguration implements Configuration
                 Log.debug("webapp=" + web_app);
         }
         
-        _preUnpackBaseResource = context.getBaseResource();
+        
         
         // Do we need to extract WEB-INF/lib?
         Resource web_inf= web_app.addPath("WEB-INF/");