luehe 2004/02/25 11:51:44
Modified: el/src/java/org/apache/commons/el ImplicitObjects.java
el/src/java/org/apache/commons/el/parser ELParser.java
Log:
Fixed JDK 1.5 compilation error ("enum" is considered a reserved
keyword in JDK 1.5)
[Patch provided by Ryan Lubke]
Revision Changes Path
1.3 +5 -5
jakarta-commons/el/src/java/org/apache/commons/el/ImplicitObjects.java
Index: ImplicitObjects.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/el/src/java/org/apache/commons/el/ImplicitObjects.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImplicitObjects.java 9 Oct 2003 21:13:11 -0000 1.2
+++ ImplicitObjects.java 25 Feb 2004 19:51:44 -0000 1.3
@@ -535,10 +535,10 @@
if (pKey instanceof String) {
// Drain the header enumeration
List l = new ArrayList ();
- Enumeration enum = request.getHeaders ((String) pKey);
- if (enum != null) {
- while (enum.hasMoreElements ()) {
- l.add (enum.nextElement ());
+ Enumeration e = request.getHeaders ((String) pKey);
+ if (e != null) {
+ while (e.hasMoreElements ()) {
+ l.add (e.nextElement ());
}
}
String [] ret = (String []) l.toArray (new String [l.size ()]);
1.4 +2 -2
jakarta-commons/el/src/java/org/apache/commons/el/parser/ELParser.java
Index: ELParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/el/src/java/org/apache/commons/el/parser/ELParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ELParser.java 1 Aug 2003 21:12:32 -0000 1.3
+++ ELParser.java 25 Feb 2004 19:51:44 -0000 1.4
@@ -1838,8 +1838,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements();
enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration e = jj_expentries.elements();
e.hasMoreElements();) {
+ int[] oldentry = (int[])(e.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
