remm 01/07/24 21:25:58
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java LocalStrings.properties
Log:
- Throw IAE if name is nul in setAttribute call.
Revision Changes Path
1.30 +9 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApplicationContext.java 2001/07/22 20:25:08 1.29
+++ ApplicationContext.java 2001/07/25 04:25:58 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.29 2001/07/22 20:25:08 pier Exp $
- * $Revision: 1.29 $
- * $Date: 2001/07/22 20:25:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.30 2001/07/25 04:25:58 remm Exp $
+ * $Revision: 1.30 $
+ * $Date: 2001/07/25 04:25:58 $
*
* ====================================================================
*
@@ -113,7 +113,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.29 $ $Date: 2001/07/22 20:25:08 $
+ * @version $Revision: 1.30 $ $Date: 2001/07/25 04:25:58 $
*/
public class ApplicationContext
@@ -908,6 +908,11 @@
* @param value New attribute value to be bound
*/
public void setAttribute(String name, Object value) {
+
+ // Name cannot be null
+ if (name == null)
+ throw new IllegalArgumentException
+ (sm.getString("applicationContext.setAttribute.namenull"));
// Null value is the same as removeAttribute()
if (value == null) {
1.35 +1 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- LocalStrings.properties 2001/07/22 18:38:05 1.34
+++ LocalStrings.properties 2001/07/25 04:25:58 1.35
@@ -1,5 +1,6 @@
applicationContext.attributeEvent=Exception thrown by attributes event listener
applicationContext.requestDispatcher.iae=Path {0} does not start with a "/"
character
+applicationContext.setAttribute.namenull=Name cannot be null
applicationDispatcher.allocateException=Allocate exception for servlet {0}
applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
applicationDispatcher.forward.ise=Cannot forward after response has been committed
