grchiu      2003/06/11 14:26:35

  Modified:    java/src/org/apache/xalan/xsltc/compiler Expression.java
  Log:
  Fix for bugzilla 20685. In startResetIterator(), check see if the
  expression wrapped by the CastExpr is a VariableRef. If so, don't
  generate a call to setStartNode.
  
  Revision  Changes    Path
  1.18      +5 -2      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java
  
  Index: Expression.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Expression.java   30 Jan 2003 18:46:00 -0000      1.17
  +++ Expression.java   11 Jun 2003 21:26:35 -0000      1.18
  @@ -189,7 +189,10 @@
            return;             // nothing to do
        }
   
  -     if ( (this instanceof VariableRefBase) == false ) {
  +     Expression expr = this;
  +     if (expr instanceof CastExpr)
  +         expr = ((CastExpr)expr).getExpr();
  +     if ( (expr instanceof VariableRefBase) == false ) {
            il.append(methodGen.loadContextNode());
            il.append(methodGen.setStartNode());
        }
  
  
  

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

Reply via email to