From f0fa131de407b0da1b513e6f0e28cd3d0cb747ed Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 12 Nov 2009 21:36:49 +0000 Subject: [PATCH] Fix NPEs on startup with relative ordering and provide somewhere to store results of annotation scanning when that is implemented git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835567 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/ContextConfig.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index ef56db18e..2a1378c6d 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1472,7 +1472,7 @@ public class ContextConfig JarFile jarFile = null; InputStream stream = null; - WebXml fragment = null; + WebXml fragment = new WebXml(); try { urlConn.setUseCaches(false); @@ -1485,7 +1485,6 @@ public class ContextConfig urlConn.getJarFileURL().toString() + File.separatorChar + FRAGMENT_LOCATION); source.setByteStream(stream); - fragment = new WebXml(); parseWebXml(source, fragment, true); } } finally { @@ -1503,15 +1502,11 @@ public class ContextConfig // ignore } } - if (fragment == null) { - fragments.put(urlConn.getURL().toString(), fragment); - } else { - fragment.setURL(urlConn.getURL()); - if (fragment.getName() == null) { - fragment.setName(fragment.getURL().toString()); - } - fragments.put(fragment.getName(), fragment); + fragment.setURL(urlConn.getURL()); + if (fragment.getName() == null) { + fragment.setName(fragment.getURL().toString()); } + fragments.put(fragment.getName(), fragment); } } -- 2.11.0