jfarcand 2003/01/29 14:40:19
Modified: catalina/src/share/org/apache/catalina/core
DummyRequest.java
Log:
Return an empty enumeration instead of a null to be spec compliant (and to avoid
JspServlet to throw NPE)
Revision Changes Path
1.6 +14 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyRequest.java
Index: DummyRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DummyRequest.java 29 Jan 2003 20:57:16 -0000 1.5
+++ DummyRequest.java 29 Jan 2003 22:40:19 -0000 1.6
@@ -155,6 +155,15 @@
protected FilterChain filterChain = null;
protected ValveContext valveContext = null;
+
+ protected Enumeration dummyEnum = new Enumeration(){
+ public boolean hasMoreElements(){
+ return false;
+ }
+ public Object nextElement(){
+ return null;
+ }
+ };
public String getContextPath() {
return (contextPath);
@@ -310,7 +319,7 @@
public void setUserPrincipal(Principal principal) {}
public String getParameter(String name) { return null; }
public Map getParameterMap() { return null; }
- public Enumeration getParameterNames() { return null; }
+ public Enumeration getParameterNames() { return dummyEnum; }
public String[] getParameterValues(String name) { return null; }
public RequestDispatcher getRequestDispatcher(String path) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
