Author: markt
Date: Sun Jul 6 21:55:33 2014
New Revision: 1608303
URL: http://svn.apache.org/r1608303
Log:
kkolinko review: Extend NPE protection
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1608301
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1608303&r1=1608302&r2=1608303&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Sun Jul 6 21:55:33 2014
@@ -456,7 +456,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]
