yoavs 2004/08/29 08:33:45
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
CoyoteResponse.java
Log:
Don't use enum as a variable name, it's a JDK 1.5 keyword.
Revision Changes Path
1.38 +4 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- CoyoteRequest.java 24 Feb 2004 08:54:29 -0000 1.37
+++ CoyoteRequest.java 29 Aug 2004 15:33:45 -0000 1.38
@@ -899,9 +899,9 @@
if (parameterMap.isLocked())
return parameterMap;
- Enumeration enum = getParameterNames();
- while (enum.hasMoreElements()) {
- String name = enum.nextElement().toString();
+ Enumeration paramNames = getParameterNames();
+ while (paramNames.hasMoreElements()) {
+ String name = paramNames.nextElement().toString();
String[] values = getParameterValues(name);
parameterMap.put(name, values);
}
1.39 +4 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- CoyoteResponse.java 20 Jun 2004 20:58:31 -0000 1.38
+++ CoyoteResponse.java 29 Aug 2004 15:33:45 -0000 1.39
@@ -736,10 +736,10 @@
*/
public String[] getHeaderValues(String name) {
- Enumeration enum = coyoteResponse.getMimeHeaders().values(name);
+ Enumeration headerValues = coyoteResponse.getMimeHeaders().values(name);
Vector result = new Vector();
- while (enum.hasMoreElements()) {
- result.addElement(enum.nextElement());
+ while (headerValues.hasMoreElements()) {
+ result.addElement(headerValues.nextElement());
}
String[] resultArray = new String[result.size()];
result.copyInto(resultArray);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
