cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemLiteralResult.java ElemUse.java

[minchau]

minchau     2003/10/23 11:28:28

  Modified:    java/src/org/apache/xalan/templates ElemLiteralResult.java
                        ElemUse.java
  Log:
  Error message for testcase attribseterr07
  PR: bug 782
  Submitted by: Richard Cao
  Reviewed by:  Brian Minchau
  
  Revision  Changes    Path
  1.39      +7 -0      
xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java
  
  Index: ElemLiteralResult.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ElemLiteralResult.java    17 Oct 2003 20:59:19 -0000      1.38
  +++ ElemLiteralResult.java    23 Oct 2003 18:28:28 -0000      1.39
  @@ -745,6 +745,13 @@
               else
                   throw new TransformerException(se);
           }
  +        
  +        /* If an exception was thrown in the middle but not with 
startElement() or
  +         * or endElement() then its time to let it percolate.
  +         */ 
  +        if (tException != null)
  +            throw tException; 
  +        
           unexecuteNSDecls(transformer);
   
           // JJK Bugzilla 3464, test namespace85 -- balance explicit start.
  
  
  
  1.18      +8 -0      
xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java
  
  Index: ElemUse.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ElemUse.java      17 Oct 2003 20:59:20 -0000      1.17
  +++ ElemUse.java      23 Oct 2003 18:28:28 -0000      1.18
  @@ -60,6 +60,8 @@
   
   import javax.xml.transform.TransformerException;
   
  +import org.apache.xalan.res.XSLMessages;
  +import org.apache.xalan.res.XSLTErrorResources;
   import org.apache.xalan.transformer.TransformerImpl;
   import org.apache.xml.utils.QName;
   
  @@ -202,6 +204,12 @@
   
               attrSet.execute(transformer);
             }
  +        } 
  +        else 
  +        {
  +          throw new TransformerException(
  +              XSLMessages.createMessage(XSLTErrorResources.ER_NO_ATTRIB_SET, 
  +                  new Object[] {qname}),this); 
           }
         }
       }
  
  
  

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