Author: markt
Date: Mon Jul 30 21:57:05 2012
New Revision: 1367330
URL: http://svn.apache.org/viewvc?rev=1367330&view=rev
Log:
Avoid unlikely NPE
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1367330&r1=1367329&r2=1367330&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Mon Jul 30
21:57:05 2012
@@ -740,7 +740,7 @@ public final class Mapper {
}
// Context mapping
- if (mappingData.context == null) {
+ if (mappingData.context == null && contexts != null) {
int pos = find(contexts, uri);
if (pos == -1) {
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
