You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/11/14 16:36:07 UTC
svn commit: r594915 - in
/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel:
extvar/jdbc/DbExternalVariable.java runtime/SCOPE.java
Author: mszefler
Date: Wed Nov 14 07:36:05 2007
New Revision: 594915
URL: http://svn.apache.org/viewvc?rev=594915&view=rev
Log:
Fixed messed up merge.
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java?rev=594915&r1=594914&r2=594915&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java Wed Nov 14 07:36:05 2007
@@ -38,7 +38,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import edu.emory.mathcs.backport.java.util.Collections;
+import java.util.Collections;
/**
* Configuration for an external variable.
@@ -526,4 +526,4 @@
return ret;
}
-}
\ No newline at end of file
+}
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?rev=594915&r1=594914&r2=594915&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java Wed Nov 14 07:36:05 2007
@@ -26,6 +26,7 @@
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.bpel.evt.VariableModificationEvent;
import org.apache.ode.bpel.explang.EvaluationContext;
+import org.apache.ode.bpel.explang.EvaluationException;
import org.apache.ode.bpel.o.*;
import org.apache.ode.bpel.runtime.channels.*;
import org.apache.ode.jacob.ChannelListener;
@@ -72,6 +73,11 @@
FaultData fd = createFault(e.getQName(), var.extVar, "Unable to initialize external variable key: " + e.getMessage());
_self.parent.completed(fd,null);
return;
+ } catch (EvaluationException ee) {
+ __log.error("Unable to initialize external variable key.", ee);
+ FaultData fd = createFault(var.getOwner().constants.qnSubLanguageExecutionFault, var.extVar, "Unable to initialize external variable key: " + ee.getMessage());
+ _self.parent.completed(fd,null);
+ return;
}
keymap.put(mapping.getKey(),val);
}