1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Description: Rename the 'enum' variables to build with Java 5+
Author: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Forwarded: not-needed
diff --git a/src/java/org/apache/commons/el/ImplicitObjects.java b/src/java/org/apache/commons/el/ImplicitObjects.java
index b58e4a4..7a33477 100644
--- a/src/java/org/apache/commons/el/ImplicitObjects.java
+++ b/src/java/org/apache/commons/el/ImplicitObjects.java
@@ -535,10 +535,10 @@ public class ImplicitObjects
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 enum_ = request.getHeaders ((String) pKey);
+ if (enum_ != null) {
+ while (enum_.hasMoreElements ()) {
+ l.add (enum_.nextElement ());
}
}
String [] ret = (String []) l.toArray (new String [l.size ()]);
diff --git a/src/java/org/apache/commons/el/parser/ELParser.java b/src/java/org/apache/commons/el/parser/ELParser.java
index 4cc2f04..dbbd954 100644
--- a/src/java/org/apache/commons/el/parser/ELParser.java
+++ b/src/java/org/apache/commons/el/parser/ELParser.java
@@ -1838,8 +1838,8 @@ public class ELParser implements ELParserConstants {
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 enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
+ int[] oldentry = (int[])(enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
--
|
