Author: markt
Date: Tue Dec 8 00:29:50 2009
New Revision: 888203
URL: http://svn.apache.org/viewvc?rev=888203&view=rev
Log:
Fix a couple of potential NPEs
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=888203&r1=888202&r2=888203&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Dec 8
00:29:50 2009
@@ -706,15 +706,19 @@
mergeFilter(entry.getValue(),
filters.get(entry.getKey()), false);
} else {
- if (!(mergeFilter(entry.getValue(),
- temp.getFilters().get(entry.getKey()), true))) {
- log.error(sm.getString(
- "webXml.mergeConflictFilter",
- entry.getKey(),
- fragment.getName(),
- fragment.getURL()));
-
- return false;
+ if (temp.getFilters().containsKey(entry.getKey())) {
+ if (!(mergeFilter(entry.getValue(),
+ temp.getFilters().get(entry.getKey()), true)))
{
+ log.error(sm.getString(
+ "webXml.mergeConflictFilter",
+ entry.getKey(),
+ fragment.getName(),
+ fragment.getURL()));
+
+ return false;
+ }
+ } else {
+ temp.getFilters().put(entry.getKey(),
entry.getValue());
}
}
}
@@ -845,15 +849,19 @@
mergeServlet(entry.getValue(),
servlets.get(entry.getKey()), false);
} else {
- if (!(mergeServlet(entry.getValue(),
- temp.getServlets().get(entry.getKey()), true))) {
- log.error(sm.getString(
- "webXml.mergeConflictServlet",
- entry.getKey(),
- fragment.getName(),
- fragment.getURL()));
-
- return false;
+ if (temp.getServlets().containsKey(entry.getKey())) {
+ if (!(mergeServlet(entry.getValue(),
+ temp.getServlets().get(entry.getKey()),
true))) {
+ log.error(sm.getString(
+ "webXml.mergeConflictServlet",
+ entry.getKey(),
+ fragment.getName(),
+ fragment.getURL()));
+
+ return false;
+ }
+ } else {
+ temp.getServlets().put(entry.getKey(),
entry.getValue());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
