Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 62795 invoked from network); 18 Jun 2009 22:04:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jun 2009 22:04:20 -0000 Received: (qmail 51340 invoked by uid 500); 18 Jun 2009 22:04:31 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 51295 invoked by uid 500); 18 Jun 2009 22:04:31 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 51286 invoked by uid 99); 18 Jun 2009 22:04:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2009 22:04:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2009 22:04:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 25C0023888CD; Thu, 18 Jun 2009 22:04:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r786312 - in /ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang: xpath10/compiler/XPathMessages.java xpath20/compiler/XPath20ExpressionCompilerImpl.java xquery10/compiler/XQuery10ExpressionCompilerImpl.java Date: Thu, 18 Jun 2009 22:04:08 -0000 To: commits@ode.apache.org From: midon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090618220409.25C0023888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: midon Date: Thu Jun 18 22:04:08 2009 New Revision: 786312 URL: http://svn.apache.org/viewvc?rev=786312&view=rev Log: throw a CompilationException and provide a more meaningful message Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java?rev=786312&r1=786311&r2=786312&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java (original) +++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java Thu Jun 18 22:04:08 2009 @@ -22,6 +22,9 @@ import org.apache.ode.bpel.compiler.api.CompilationMessage; import org.apache.ode.bpel.compiler.api.CompilationMessageBundle; +import javax.xml.namespace.QName; +import java.net.URI; + /** * Compilation messages related to XPath 1.0 expressions. * @author mriou @@ -107,5 +110,9 @@ return super.formatCompilationMessage("Attempt to use the messageType variable {0} in an expression " + " even though the associated message is undefined or has no part.", message); } + /** Empty query */ + public CompilationMessage errExpressionEmpty(URI docUri, QName elementName) { + return super.formatCompilationMessage("XPath elementName and xpath node are both empty in file: {0}, element: {1}", docUri, elementName.toString()); + } } Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java?rev=786312&r1=786311&r2=786312&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java (original) +++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java Thu Jun 18 22:04:08 2009 @@ -126,7 +126,7 @@ String xpathStr; Node node = source.getExpression(); if (node == null) { - throw new IllegalStateException("XPath string and xpath node are both null"); + throw new CompilationException(__msgs.errExpressionEmpty(source.getURI(), new QName(source.getElement().getNamespaceURI(), source.getElement().getNodeName()))); } if (node.getNodeType() != Node.TEXT_NODE) { throw new CompilationException(__msgs.errUnexpectedNodeTypeForXPath(DOMUtils.domToString(node))); Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java?rev=786312&r1=786311&r2=786312&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java (original) +++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java Thu Jun 18 22:04:08 2009 @@ -29,7 +29,6 @@ import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; -import javax.xml.xpath.XPathExpressionException; import javax.xml.xquery.XQConnection; import javax.xml.xquery.XQConstants; import javax.xml.xquery.XQDataSource; @@ -147,7 +146,7 @@ String xqueryStr; Node node = source.getExpression(); if (node == null) { - throw new IllegalStateException("XQuery string and xpath node are both null"); + throw new CompilationException(__msgs.errExpressionEmpty(source.getURI(), new QName(source.getElement().getNamespaceURI(), source.getElement().getNodeName()))); } if (node.getNodeType() != Node.TEXT_NODE && node.getNodeType() != Node.ELEMENT_NODE &&