remm 01/07/24 21:27:29 Modified: catalina/src/share/org/apache/catalina/connector LocalStrings.properties RequestBase.java Log: - Throw IAE if name is null in setAttribute call. Revision Changes Path 1.5 +1 -0 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties Index: LocalStrings.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LocalStrings.properties 2001/04/26 17:41:07 1.4 +++ LocalStrings.properties 2001/07/25 04:27:29 1.5 @@ -10,6 +10,7 @@ responseBase.getWriter.ise=getOutputStream() has already been called for this response responseBase.reset.ise=Cannot reset after response has been committed responseBase.resetBuffer.ise=Cannot reset buffer after response has been committed +requestBase.setAttribute.namenull=Name cannot be null responseBase.setBufferSize.ise=Buffer size cannot be changed after data has been written responseStream.close.closed=This output stream has already been closed responseStream.flush.closed=Cannot flush a closed output stream 1.16 +9 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java Index: RequestBase.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- RequestBase.java 2001/07/22 20:25:06 1.15 +++ RequestBase.java 2001/07/25 04:27:29 1.16 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.15 2001/07/22 20:25:06 pier Exp $ - * $Revision: 1.15 $ - * $Date: 2001/07/22 20:25:06 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.16 2001/07/25 04:27:29 remm Exp $ + * $Revision: 1.16 $ + * $Date: 2001/07/25 04:27:29 $ * * ==================================================================== * @@ -98,7 +98,7 @@ * the connector-specific methods need to be implemented. * * @author Craig R. McClanahan - * @version $Revision: 1.15 $ $Date: 2001/07/22 20:25:06 $ + * @version $Revision: 1.16 $ $Date: 2001/07/25 04:27:29 $ */ public abstract class RequestBase @@ -971,6 +971,11 @@ * @param value The associated value */ public void setAttribute(String name, Object value) { + + // Name cannot be null + if (name == null) + throw new IllegalArgumentException + (sm.getString("requestBase.setAttribute.namenull")); // Null value is the same as removeAttribute() if (value == null) {