Return-Path: Delivered-To: apmail-xml-xalan-cvs-archive@www.apache.org Received: (qmail 76436 invoked from network); 23 Oct 2003 18:28:29 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 23 Oct 2003 18:28:29 -0000 Received: (qmail 5506 invoked by uid 500); 23 Oct 2003 18:28:20 -0000 Delivered-To: apmail-xml-xalan-cvs-archive@xml.apache.org Received: (qmail 5489 invoked by uid 500); 23 Oct 2003 18:28:20 -0000 Mailing-List: contact xalan-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: Delivered-To: mailing list xalan-cvs@xml.apache.org Received: (qmail 5476 invoked from network); 23 Oct 2003 18:28:20 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 23 Oct 2003 18:28:20 -0000 Received: (qmail 76430 invoked by uid 1663); 23 Oct 2003 18:28:28 -0000 Date: 23 Oct 2003 18:28:28 -0000 Message-ID: <20031023182828.76429.qmail@minotaur.apache.org> From: minchau@apache.org To: xml-xalan-cvs@apache.org Subject: cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemLiteralResult.java ElemUse.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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: xalan-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: xalan-cvs-help@xml.apache.org