From badbe6d252d8c3b69e7568f35a7533b15ff08560 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 26 Jul 2010 08:56:32 +0000 Subject: [PATCH] Ooops. Ensure MetaData.origins is set git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2174 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../src/main/java/org/eclipse/jetty/webapp/MetaData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java index 555663386ef..1800ccdfc17 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java @@ -37,7 +37,7 @@ public class MetaData public enum Origin {NotSet, WebXml, WebDefaults, WebOverride, WebFragment, Annotation}; - protected Map _origins; + protected Map _origins =new HashMap(); protected Descriptor _webDefaultsRoot; protected Descriptor _webXmlRoot; protected Descriptor _webOverrideRoot; @@ -260,7 +260,7 @@ public class MetaData throws Exception { //Ensure origins is fresh - _origins = new HashMap(); + _origins.clear(); // Set the ordered lib attribute List orderedLibs = new ArrayList();