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/08/15 20:09:39 UTC

svn commit: r566284 - in /ode/branches/bart: axis2/src/main/java/org/apache/ode/axis2/ bpel-api/src/main/java/org/apache/ode/bpel/iapi/ bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ bpel-obj/src/main/java/org/apache/ode/bpel/o/ bpel-runtime...

Author: mszefler
Date: Wed Aug 15 11:09:37 2007
New Revision: 566284

URL: http://svn.apache.org/viewvc?view=rev&rev=566284
Log:
Cleanup of "todo" comments.

Modified:
    ode/branches/bart/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
    ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/EndpointReference.java
    ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MessageExchange.java
    ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
    ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
    ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGeneratorMessages.java
    ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGeneratorMessages.java
    ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java
    ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
    ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java

Modified: ode/branches/bart/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java (original)
+++ ode/branches/bart/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java Wed Aug 15 11:09:37 2007
@@ -81,14 +81,13 @@
     
 
     public void onMyRoleMessageExchangeStateChanged(MyRoleMessageExchange myRoleMessageExchange) throws BpelEngineException {
-        // TODO: add code here to handle MEXs that we've "forgotten" about due to system failure etc.. mostly
+        // Add code here to handle MEXs that we've "forgotten" about due to system failure etc.. mostly
         // useful for RELIABLE, but nice to have with ASYNC/BLOCKING as well. 
     }
 
 
     public void cancel(PartnerRoleMessageExchange mex) throws ContextException {
-        // TODO Auto-generated method stub
-        
+
     }
 
 

Modified: ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/EndpointReference.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/EndpointReference.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/EndpointReference.java (original)
+++ ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/EndpointReference.java Wed Aug 15 11:09:37 2007
@@ -40,7 +40,6 @@
    * structure is up to the integration layer. This method is
    * used by the BPEL engine to persist EPR references in the 
    * database. 
-   * TODO: avoid using DOM
    * @return destination for the generated XML
    */
   Document toXML(); 

Modified: ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MessageExchange.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MessageExchange.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MessageExchange.java (original)
+++ ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MessageExchange.java Wed Aug 15 11:09:37 2007
@@ -198,7 +198,6 @@
      * Get the operation description for this message exchange.
      * It is possible that the description cannot be resolved, for example if
      * the EPR is unknown or if the operation does not exist.
-     * TODO: How to get rid of the WSDL4j dependency?
      * @return WSDL operation description or <code>null</code> if not availble
      */
     Operation getOperation();
@@ -207,7 +206,6 @@
      * Get the port type description for this message exchange.
      * It is possible that the description cannot be resolved, for example if
      * the EPR is unknown or if the operation does not exist.
-     * TODO: How to get rid of the WSDL4j dependency?
      * @return WSDL port type description or <code>null</code> if not available.
      */
     PortType getPortType();

Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java Wed Aug 15 11:09:37 2007
@@ -169,7 +169,6 @@
                     if (vv.getLocation() != null && vv.getLocation().getExpression() != null)
                         vref.location = _context.compileExpr(vv.getLocation());
                 }
-                // TODO: check for irrelevant properties.
                 return vref;
             } else if (from.isPartnerLinkVal()) {
                 PartnerLinkVal plv = from.getAsPartnerLinkVal();
@@ -230,7 +229,6 @@
                     if (vv.getLocation() != null && vv.getLocation().getExpression() != null)
                         vref.location = _context.compileExpr(vv.getLocation());
                 }
-                // TODO: check for irrelevant properties.
                 return vref;
             } else if (to.isPartnerLinkVal()) {
                 OAssign.PartnerLinkRef plref = new OAssign.PartnerLinkRef(_context.getOProcess());

Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java Wed Aug 15 11:09:37 2007
@@ -52,30 +52,27 @@
 
         oinvoke.partnerLink = _context.resolvePartnerLink(src.getPartnerLink());
         oinvoke.operation = _context.resolvePartnerRoleOperation(oinvoke.partnerLink, src.getOperation());
-        assert oinvoke.operation.getInput() != null; // ensured by
-        // resolvePartnerRoleOperation
-        assert oinvoke.operation.getInput().getMessage() != null; // ensured
-        // by
-        // resolvePartnerRoleOperation
-        // TODO: Add portType checking if specified by user
-        // if (portType != null &&
-        // !portType.equals(onMessage.partnerLink.myRolePortType.getQName()))
-        // throw new CompilationException(CMSGSG.errPortTypeMismatch(portType,
-        // onMessage.partnerLink.myRolePortType.getQName()));
+        assert oinvoke.operation.getInput() != null; // ensured by reolvePartnerRoleOperation
+        assert oinvoke.operation.getInput().getMessage() != null; // ensured by resolvePartnerRoleOperation
+        if (src.getPortType() != null) {
+            if (!src.getPortType().equals(oinvoke.partnerLink.partnerRolePortType.getQName())
+                    throw new CompilationException(__imsgs.errPortTypeMismatch(src.getPortType(), oinvoke.partnerLink.partnerRolePortType.getQName()));
+        }
+
         if (oinvoke.operation.getInput() != null && oinvoke.operation.getInput().getMessage() != null) {
-            // Input var can be omitted if input message has no part 
+            // Input var can be omitted if input message has no part
             if (oinvoke.operation.getInput().getMessage().getParts().size() > 0) {
                 if (src.getInputVar() == null)
                     throw new CompilationException(__imsgs.errInvokeNoInputMessageForInputOp(oinvoke.operation.getName()));
-                oinvoke.inputVar = _context.resolveMessageVariable(src.getInputVar(), oinvoke.operation.getInput()
-                        .getMessage().getQName());
+                oinvoke.inputVar = _context.resolveMessageVariable(src.getInputVar(), oinvoke.operation.getInput().getMessage()
+                        .getQName());
             }
         }
         if (oinvoke.operation.getOutput() != null && oinvoke.operation.getOutput().getMessage() != null) {
             if (src.getOutputVar() == null)
                 throw new CompilationException(__imsgs.errInvokeNoOutputMessageForOutputOp(oinvoke.operation.getName()));
-            oinvoke.outputVar = _context.resolveMessageVariable(src.getOutputVar(), oinvoke.operation.getOutput()
-                    .getMessage().getQName());
+            oinvoke.outputVar = _context.resolveMessageVariable(src.getOutputVar(), oinvoke.operation.getOutput().getMessage()
+                    .getQName());
         }
         List<Correlation> correlations = src.getCorrelations();
         List<Correlation> incorrelations = CollectionsX.filter(new ArrayList<Correlation>(), correlations,
@@ -102,25 +99,20 @@
                 });
 
         if (oinvoke.inputVar != null) {
-            doCorrelations(outcorrelations, oinvoke.inputVar, oinvoke.assertCorrelationsInput,
-                    oinvoke.initCorrelationsInput);
-            doCorrelations(inoutcorrelations, oinvoke.inputVar, oinvoke.assertCorrelationsInput,
-                    oinvoke.initCorrelationsInput);
+            doCorrelations(outcorrelations, oinvoke.inputVar, oinvoke.assertCorrelationsInput, oinvoke.initCorrelationsInput);
+            doCorrelations(inoutcorrelations, oinvoke.inputVar, oinvoke.assertCorrelationsInput, oinvoke.initCorrelationsInput);
         }
         if (oinvoke.outputVar != null) {
-            doCorrelations(incorrelations, oinvoke.outputVar,
-                    oinvoke.assertCorrelationsOutput, oinvoke.initCorrelationsOutput);
-            doCorrelations(inoutcorrelations, oinvoke.outputVar,
-                    oinvoke.assertCorrelationsOutput, oinvoke.initCorrelationsOutput);
+            doCorrelations(incorrelations, oinvoke.outputVar, oinvoke.assertCorrelationsOutput, oinvoke.initCorrelationsOutput);
+            doCorrelations(inoutcorrelations, oinvoke.outputVar, oinvoke.assertCorrelationsOutput, oinvoke.initCorrelationsOutput);
         }
-        
 
-//        Partner link could be initialized with magic session in a previous receive.
-//        if (!oinvoke.getOwner().version.equals(Constants.NS_BPEL4WS_2003_03)) {
-//            if (!oinvoke.partnerLink.initializePartnerRole && !_context.isPartnerLinkAssigned(oinvoke.partnerLink.getName())) {
-//                throw new CompilationException(__cmsgs.errUninitializedPartnerLinkInInvoke(oinvoke.partnerLink.getName()));
-//            }
-//        }
+        // Partner link could be initialized with magic session in a previous receive.
+        // if (!oinvoke.getOwner().version.equals(Constants.NS_BPEL4WS_2003_03)) {
+        // if (!oinvoke.partnerLink.initializePartnerRole && !_context.isPartnerLinkAssigned(oinvoke.partnerLink.getName())) {
+        // throw new CompilationException(__cmsgs.errUninitializedPartnerLinkInInvoke(oinvoke.partnerLink.getName()));
+        // }
+        // }
     }
 
     private void doCorrelations(List<Correlation> correlations, OScope.Variable var,

Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGeneratorMessages.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGeneratorMessages.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGeneratorMessages.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGeneratorMessages.java Wed Aug 15 11:09:37 2007
@@ -19,6 +19,8 @@
 
 package org.apache.ode.bpel.compiler;
 
+import javax.xml.namespace.QName;
+
 import org.apache.ode.bpel.compiler.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompilationMessageBundle;
 
@@ -40,8 +42,15 @@
      */
     public CompilationMessage errInvokeNoInputMessageForInputOp(String operation) {
         return this.formatCompilationMessage(
-            "Invoke doesn't define an output variable even though the operation \"{0}\" "
-                + "declares an output message.", operation);
+                "Invoke doesn't define an output variable even though the operation \"{0}\" "
+                    + "declares an output message.", operation);
+    }
+
+    public CompilationMessage errPortTypeMismatch(QName iptype, QName pltype) {
+        return this.formatCompilationMessage(
+                "The portType \"{0}\" specified on the <invoke> does not match \"{1}\", the port type declared in the" +
+                "partner link.", iptype, pltype);
+
     }
 
 }

Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGeneratorMessages.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGeneratorMessages.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGeneratorMessages.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGeneratorMessages.java Wed Aug 15 11:09:37 2007
@@ -33,14 +33,12 @@
                 + " second set was \"{0}\".", setName);
     }
 
-    // TODO: better error message
     public CompilationMessage errForOrUntilMustBeGiven() {
-        return this.formatCompilationMessage("errForOrUntilMustBeGiven");
+        return this.formatCompilationMessage("An <onAlarm> block must include a <for> or <until> block.");
     }
 
-    // TODO: better error message
     public CompilationMessage errOnAlarmWithCreateInstance() {
-        return this.formatCompilationMessage("errOnAlarmWithCreateInstance");
+        return this.formatCompilationMessage("An <onAlarm> may not be used when createInstance=yes.");
     }
 
     public CompilationMessage errRendezvousNotSupported() {

Modified: ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java (original)
+++ ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java Wed Aug 15 11:09:37 2007
@@ -36,7 +36,4 @@
         super(owner);
     }
 
-    public Collection<OLink> outgoinglinks() {
-        throw new UnsupportedOperationException(); // TODO: implement me!
-    }
 }

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Wed Aug 15 11:09:37 2007
@@ -1070,7 +1070,14 @@
             if (old == Status.ASYNC) {
                 MyRoleMessageExchangeImpl mymex = _myRoleMexCache.get(mexdao);
                 mymex.onAsyncAck(mexdao);
+                
+                try {
+                    _contexts.mexContext.onMyRoleMessageExchangeStateChanged(mymex);
+                } catch (Throwable t) {
+                    __log.error("Integration layer threw an unexepcted exception.", t);
+                }
             }
+            
         }
 
     }

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Wed Aug 15 11:09:37 2007
@@ -520,8 +520,19 @@
         // Get the "my-role" mex from the DB.
         MessageExchangeDAO myrolemex = _dao.getConnection().getMessageExchange(mexRef);
 
-        // TODO: add some checks here/could get npe
-        MessageDAO message = myrolemex.createMessage(plinkInstnace.partnerLink.getMyRoleOperation(opName).getOutput().getMessage()
+        Operation operation = plinkInstnace.partnerLink.getMyRoleOperation(opName);
+        if (operation == null || operation.getOutput() == null) {
+            // reply to operation that is either not defined or one-way
+            // Perhaps this should be detected at compile time? 
+            throw new FaultException(_bpelProcess.getOProcess().constants.qnMissingRequest,
+                    "Undefined two-way operation \"" + opName + "\".");
+            
+        }
+        
+        // TODO what if msg==null? i.e. for a reply-with-fault.
+        
+        MessageDAO message = myrolemex.createMessage(
+                operation.getOutput().getMessage()
                 .getQName());
         message.setData(msg);
 

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java Wed Aug 15 11:09:37 2007
@@ -545,7 +545,7 @@
             };
 
             try {
-                if (inmemdao != null || _contexts.isTransacted()) // TODO: hmmmmm, catch-22, need to be able to infer if TRANSACTED/RELIABLE just from mex id ? here || istyle == InvocationStyle.RELIABLE || istyle == InvocationStyle.TRANSACTED)
+                if (inmemdao != null || _contexts.isTransacted()) 
                     return loadMex.call();
                 else 
                     return enqueueTransaction(loadMex).get();

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java Wed Aug 15 11:09:37 2007
@@ -359,7 +359,7 @@
     // INSTANCE ACTIONS
     //
     public InstanceInfoDocument fault(Long iid, QName faultname, Element faultData) {
-        // TODO: Implement
+        // TODO: implement me!
         return genInstanceInfoDocument(iid);
     }
 
@@ -765,7 +765,6 @@
             }
         }
 
-        // TODO: add documents to the above data structure.
     }
 
     /**
@@ -1234,8 +1233,7 @@
                     else if ("version".equals(orderKey))
                         c = new Comparator<ProcessConf>() {
                             public int compare(ProcessConf o1, ProcessConf o2) {
-                                // TODO: implement version comparisons.
-                                return 0;
+                                return (int) (o1.getVersion() - o2.getVersion());
                             }
                         };
                     else if ("deployed".equals(orderKey))

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java Wed Aug 15 11:09:37 2007
@@ -11,8 +11,7 @@
 /**
  * Transacted my-role message exchange.
  * 
- * TODO: IMPLEMENT!
- * 
+
  * @author Maciej Szefler
  * 
  */

Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java Wed Aug 15 11:09:37 2007
@@ -46,13 +46,12 @@
         }
         FaultData fault = null;
 
-        // TODO: Check for fault without message.
 
         try {
-            Node msg = getBpelRuntimeContext()
+            Node msg = oreply.variable == null ? null : getBpelRuntimeContext()
                     .fetchVariableData(_scopeFrame.resolve(oreply.variable), false);
 
-            assert msg instanceof Element;
+            assert msg == null || msg instanceof Element; // note msg can be null for faults 
 
             for (Iterator i = oreply.initCorrelations.iterator(); i.hasNext(); ) {
                 OScope.CorrelationSet cset = (OScope.CorrelationSet) i.next();
@@ -65,9 +64,7 @@
                     .reply(_scopeFrame.resolve(oreply.partnerLink), oreply.operation.getName(),
                             oreply.messageExchangeId,
                             (Element)msg,
-                            (oreply.fault != null)
-                                    ? oreply.fault
-                                    : null);
+                            oreply.fault);
         } catch (FaultException e) {
             __log.error(e);
             fault = createFault(e.getQName(), oreply);

Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java?view=diff&rev=566284&r1=566283&r2=566284
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java Wed Aug 15 11:09:37 2007
@@ -84,7 +84,6 @@
 
 
     public void onMyRoleMessageExchangeStateChanged(MyRoleMessageExchange myRoleMex) throws BpelEngineException {
-        // TODO: add support for message exchange recovery. 
     }