You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2008/07/31 12:50:47 UTC
svn commit: r681335 - in
/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime:
ASSIGN.java EXTENSIONACTIVITY.java
Author: vanto
Date: Thu Jul 31 03:50:46 2008
New Revision: 681335
URL: http://svn.apache.org/viewvc?rev=681335&view=rev
Log:
small bug in extension activity handling fixed.
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=681335&r1=681334&r2=681335&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java Thu Jul 31 03:50:46 2008
@@ -42,6 +42,7 @@
import org.apache.ode.bpel.o.OAssign.PropertyRef;
import org.apache.ode.bpel.o.OAssign.VariableRef;
import org.apache.ode.bpel.o.OMessageVarType.Part;
+import org.apache.ode.bpel.o.OProcess.OExtension;
import org.apache.ode.bpel.o.OProcess.OProperty;
import org.apache.ode.bpel.o.OScope.Variable;
import org.apache.ode.bpel.runtime.channels.FaultData;
@@ -598,14 +599,15 @@
try {
ExtensionOperation ea = getBpelRuntimeContext().createExtensionActivityImplementation(extensionId);
if (ea == null) {
- if (eao.getOwner().mustUnderstandExtensions.contains(extensionId.getNamespaceURI())) {
- __log.warn("Lookup of extension activity " + extensionId + " failed.");
- throw new FaultException(ExtensibilityQNames.UNKNOWN_EA_FAULT_NAME, "Lookup of extension activity " + extensionId + " failed. No implementation found.");
- } else {
- // act like <empty> - do nothing
- context.complete();
- return;
+ for (OExtension oe : eao.getOwner().mustUnderstandExtensions) {
+ if (extensionId.getNamespaceURI().equals(oe.namespaceURI)) {
+ __log.warn("Lookup of extension activity " + extensionId + " failed.");
+ throw new FaultException(ExtensibilityQNames.UNKNOWN_EA_FAULT_NAME, "Lookup of extension activity " + extensionId + " failed. No implementation found.");
+ }
}
+ // act like <empty> - do nothing
+ context.complete();
+ return;
}
ea.run(context, eao.nestedElement.getElement());
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java?rev=681335&r1=681334&r2=681335&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java Thu Jul 31 03:50:46 2008
@@ -25,6 +25,7 @@
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.compiler.bom.ExtensibilityQNames;
import org.apache.ode.bpel.o.OExtensionActivity;
+import org.apache.ode.bpel.o.OProcess.OExtension;
import org.apache.ode.bpel.runtime.extension.ExtensionContext;
import org.apache.ode.bpel.runtime.extension.ExtensionOperation;
import org.apache.ode.utils.DOMUtils;
@@ -53,14 +54,15 @@
try {
ExtensionOperation ea = getBpelRuntimeContext().createExtensionActivityImplementation(extensionId);
if (ea == null) {
- if (_oext.getOwner().mustUnderstandExtensions.contains(extensionId.getNamespaceURI())) {
- __log.warn("Lookup of extension activity " + extensionId + " failed.");
- throw new FaultException(ExtensibilityQNames.UNKNOWN_EA_FAULT_NAME, "Lookup of extension activity " + extensionId + " failed. No implementation found.");
- } else {
- // act like <empty> - do nothing
- context.complete();
- return;
+ for (OExtension oe : _oext.getOwner().mustUnderstandExtensions) {
+ if (extensionId.getNamespaceURI().equals(oe.namespaceURI)) {
+ __log.warn("Lookup of extension activity " + extensionId + " failed.");
+ throw new FaultException(ExtensibilityQNames.UNKNOWN_EA_FAULT_NAME, "Lookup of extension activity " + extensionId + " failed. No implementation found.");
+ }
}
+ // act like <empty> - do nothing
+ context.complete();
+ return;
}
ea.run(context, _oext.nestedElement.getElement());