cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl ForEach.java If.java

[luehe]

luehe       2004/04/13 11:25:34

  Modified:    jasper2/src/share/org/apache/jasper/tagplugins/jstl
                        ForEach.java If.java
  Log:
  Fixed Bugzilla 28361 ("foreach no longer works in tag file")
  
  Revision  Changes    Path
  1.7       +2 -2      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java
  
  Index: ForEach.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ForEach.java      17 Mar 2004 19:23:05 -0000      1.6
  +++ ForEach.java      13 Apr 2004 18:25:34 -0000      1.7
  @@ -61,7 +61,7 @@
        // If var is specified and the body contains an EL, then sycn
        // the var attribute
        if (hasVar /* && ctxt.hasEL() */) {
  -         ctxt.generateJavaSource("pageContext.setAttribute(");
  +         ctxt.generateJavaSource("_jspx_page_context.setAttribute(");
            ctxt.generateAttribute("var");
            ctxt.generateJavaSource(", String.valueOf(" + index + "));");
        }
  @@ -148,7 +148,7 @@
   
        ctxt.generateJavaSource("while (" + iterV + ".hasNext()){");
        if (hasVar) {
  -         ctxt.generateJavaSource("pageContext.setAttribute(");
  +         ctxt.generateJavaSource("_jspx_page_context.setAttribute(");
            ctxt.generateAttribute("var");
            ctxt.generateJavaSource(", " + iterV + ".next());");
        }
  
  
  
  1.3       +1 -1      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/If.java
  
  Index: If.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/If.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- If.java   17 Mar 2004 19:23:05 -0000      1.2
  +++ If.java   13 Apr 2004 18:25:34 -0000      1.3
  @@ -37,7 +37,7 @@
                    scope = "PageContext.APPLICATION_SCOPE";
                }
            }
  -         ctxt.generateJavaSource("pageContext.setAttribute(");
  +         ctxt.generateJavaSource("_jspx_page_context.setAttribute(");
            ctxt.generateAttribute("var");
            ctxt.generateJavaSource(", new Boolean(" + condV + ")," + scope + ");");
        }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]