From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 16 Feb 2010 11:07:00 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6ff5efdb57a03f944cd100e0a573a3fdb6ffc5e5;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
Avoid NPE as config may be null but ctxt won't be

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910471 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index be7d22766..8f16a574c 100644
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -162,7 +162,7 @@ public class JspServletWrapper {
     }
 
     public ServletContext getServletContext() {
-        return config.getServletContext();
+        return ctxt.getServletContext();
     }
 
     /**