Author: violetagg
Date: Fri Jul 5 19:09:16 2013
New Revision: 1500105
URL: http://svn.apache.org/r1500105
Log:
Merged revision 1499953 from tomcat/trunk:
According EL javadoc ELContext.getContext must throw NPE when the provided
class is NULL.
Added:
tomcat/tc7.0.x/trunk/test/javax/el/TestELContext.java
- copied unchanged from r1499953,
tomcat/trunk/test/javax/el/TestELContext.java
tomcat/tc7.0.x/trunk/test/javax/el/TesterELContext.java
- copied unchanged from r1499953,
tomcat/trunk/test/javax/el/TesterELContext.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/ELContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1499953
Modified: tomcat/tc7.0.x/trunk/java/javax/el/ELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ELContext.java?rev=1500105&r1=1500104&r2=1500105&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/ELContext.java Fri Jul 5 19:09:16 2013
@@ -40,7 +40,14 @@ public abstract class ELContext {
}
// Can't use Class<?> because API needs to match specification
+ /**
+ * @throws NullPointerException
+ * If the provided key is <code>null</code>
+ */
public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ if (key == null) {
+ throw new NullPointerException();
+ }
if (this.map == null) {
return null;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1500105&r1=1500104&r2=1500105&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jul 5 19:09:16 2013
@@ -70,6 +70,11 @@
<bug>55198</bug>: Ensure attribute values in tagx files that include EL
and quoted XML characters are correctly quoted in the output. (markt)
</fix>
+ <fix>
+ Ensure that <code>javax.el.ELContext.getContext(Class)</code> will
+ throw <code>NullPointerException</code> when the provided class is
+ null. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
