[patch] commons-el-1.0-jdk15.patch

commons-el-1.0-jdk15.patch (text/plain), 1.88 KB, created by Alon Bar-Lev (RETIRED) on 2006-07-04 11:14:42 UTC

diff -urNp commons-el-1.0-src/src/java/org/apache/commons/el/ImplicitObjects.java commons-el-1.0-src.new/src/java/org/apache/commons/el/ImplicitObjects.java
--- commons-el-1.0-src/src/java/org/apache/commons/el/ImplicitObjects.java	2003-02-04 02:22:25.000000000 +0200
+++ commons-el-1.0-src.new/src/java/org/apache/commons/el/ImplicitObjects.java	2006-07-04 15:00:52.000000000 +0300
@@ -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 enum1 = request.getHeaders ((String) pKey);
+	    if (enum1 != null) {
+	      while (enum1.hasMoreElements ()) {
+		l.add (enum1.nextElement ());
 	      }
 	    }
 	    String [] ret = (String []) l.toArray (new String [l.size ()]);
diff -urNp commons-el-1.0-src/src/java/org/apache/commons/el/parser/ELParser.java commons-el-1.0-src.new/src/java/org/apache/commons/el/parser/ELParser.java
--- commons-el-1.0-src/src/java/org/apache/commons/el/parser/ELParser.java	2003-03-31 04:17:07.000000000 +0300
+++ commons-el-1.0-src.new/src/java/org/apache/commons/el/parser/ELParser.java	2006-07-04 15:01:11.000000000 +0300
@@ -1838,8 +1838,8 @@ public class ELParser implements ELParse
         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 enum1 = jj_expentries.elements(); enum1.hasMoreElements();) {
+        int[] oldentry = (int[])(enum1.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {