Author: remm
Date: Tue Nov 28 12:47:00 2017
New Revision: 1816541
URL: http://svn.apache.org/viewvc?rev=1816541&view=rev
Log:
Add NPEs to ServletContext to match the javadoc.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1816541&r1=1816540&r2=1816541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Nov
28 12:47:00 2017
@@ -690,9 +690,10 @@ public class ApplicationContext implemen
@Override
public void setAttribute(String name, Object value) {
// Name cannot be null
- if (name == null)
- throw new IllegalArgumentException
+ if (name == null) {
+ throw new NullPointerException
(sm.getString("applicationContext.setAttribute.namenull"));
+ }
// Null value is the same as removeAttribute()
if (value == null) {
@@ -1053,6 +1054,11 @@ public class ApplicationContext implemen
@Override
public boolean setInitParameter(String name, String value) {
+ // Name cannot be null
+ if (name == null) {
+ throw new NullPointerException
+ (sm.getString("applicationContext.setAttribute.namenull"));
+ }
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
throw new IllegalStateException(
sm.getString("applicationContext.setInitParam.ise",
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816541&r1=1816540&r2=1816541&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 28 12:47:00 2017
@@ -45,6 +45,13 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.3 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Add some missing NPEs to ServletContext. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.2 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
