Author: markt
Date: Fri Mar 5 12:59:52 2010
New Revision: 919397
URL: http://svn.apache.org/viewvc?rev=919397&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
Avoid NPE on background compile
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=919397&r1=919396&r2=919397&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Mar 5 12:59:52 2010
@@ -84,10 +84,3 @@
http://svn.apache.org/viewvc?rev=907819&view=rev
+1: kkolinko, rjung, markt
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
- Avoid NPE on background compile
- http://svn.apache.org/viewvc?rev=910471&view=rev
- Patch by markt
- +1: kkolinko, rjung, markt
- -1:
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=919397&r1=919396&r2=919397&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Mar 5
12:59:52 2010
@@ -250,6 +250,9 @@
<bug>46907</bug>: Don't swallow input stream when debug logging is
enabled. (markt)
</fix>
+ <fix>
+ <bug>48582</bug>: Avoid NPE on background compile. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java?rev=919397&r1=919396&r2=919397&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Fri Mar 5 12:59:52 2010
@@ -157,7 +157,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
