Author: markt
Date: Sun Jul 6 21:54:38 2014
New Revision: 1608301
URL: http://svn.apache.org/r1608301
Log:
kkolinko review: Extend NPE protection
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1608301&r1=1608300&r2=1608301&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Sun
Jul 6 21:54:38 2014
@@ -449,7 +449,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getPathTranslated() {
- if (getPathInfo() == null) {
+ if (getPathInfo() == null || getServletContext() == null) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
