Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 23978 invoked from network); 1 Oct 2007 19:06:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Oct 2007 19:06:14 -0000 Received: (qmail 31264 invoked by uid 500); 1 Oct 2007 19:06:03 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 31227 invoked by uid 500); 1 Oct 2007 19:06:03 -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 31218 invoked by uid 99); 1 Oct 2007 19:06:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2007 12:06:03 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2007 19:06:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3AF571A9832; Mon, 1 Oct 2007 12:05:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581037 - /ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java Date: Mon, 01 Oct 2007 19:05:52 -0000 To: commits@ode.apache.org From: mszefler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071001190553.3AF571A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mszefler Date: Mon Oct 1 12:05:46 2007 New Revision: 581037 URL: http://svn.apache.org/viewvc?rev=581037&view=rev Log: sub-language execution failure fault thrown when switch/if condition blows up. Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java?rev=581037&r1=581036&r2=581037&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java (original) +++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java Mon Oct 1 12:05:46 2007 @@ -50,15 +50,15 @@ for (Iterator i = oswitch.getCases().iterator(); i.hasNext();) { OSwitch.OCase ocase = (OSwitch.OCase) i.next(); try{ - if(getBpelRuntimeContext().getExpLangRuntime().evaluateAsBoolean(ocase.expression, evalCtx)){ - matchedOCase = ocase; - break; - } - } catch (EvaluationException e) { - String msg = "Unexpected evaluation exception."; - __log.error(msg,e); - // TODO: Better location information. - throw new InvalidProcessException(msg,e); + try { + if(getBpelRuntimeContext().getExpLangRuntime().evaluateAsBoolean(ocase.expression, evalCtx)){ + matchedOCase = ocase; + break; + } + } catch (EvaluationException e) { + __log.error("Sub-Language execution failure evaluating " + ocase.expression, e); + throw new FaultException(oswitch.getOwner().constants.qnSubLanguageExecutionFault, e.getMessage()); + } }catch(FaultException e){ __log.error(e.getMessage(),e); faultData = createFault(e.getQName(), ocase);