Author: markt
Date: Thu Nov 12 21:36:49 2009
New Revision: 835567
URL: http://svn.apache.org/viewvc?rev=835567&view=rev
Log:
Fix NPEs on startup with relative ordering and provide somewhere to store
results of annotation scanning when that is implemented
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=835567&r1=835566&r2=835567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Nov 12
21:36:49 2009
@@ -1472,7 +1472,7 @@
JarFile jarFile = null;
InputStream stream = null;
- WebXml fragment = null;
+ WebXml fragment = new WebXml();
try {
urlConn.setUseCaches(false);
@@ -1485,7 +1485,6 @@
urlConn.getJarFileURL().toString() +
File.separatorChar + FRAGMENT_LOCATION);
source.setByteStream(stream);
- fragment = new WebXml();
parseWebXml(source, fragment, true);
}
} finally {
@@ -1503,15 +1502,11 @@
// 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
