Author: markt Date: Tue Feb 16 11:07:00 2010 New Revision: 910471 URL: http://svn.apache.org/viewvc?rev=910471&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582 Avoid NPE as config may be null but ctxt won't be
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=910471&r1=910470&r2=910471&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Tue Feb 16 11:07:00 2010 @@ -162,7 +162,7 @@ } public ServletContext getServletContext() { - return config.getServletContext(); + return ctxt.getServletContext(); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org