You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/02/26 21:31:29 UTC
svn commit: r511990 -
/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
Author: mriou
Date: Mon Feb 26 12:31:25 2007
New Revision: 511990
URL: http://svn.apache.org/viewvc?view=rev&rev=511990
Log:
Fixing a potential NPE when a mex is released. We were still querying its state for a simple check after the release had been done.
Modified:
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java?view=diff&rev=511990&r1=511989&r2=511990
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java Mon Feb 26 12:31:25 2007
@@ -18,8 +18,16 @@
*/
package org.apache.ode.jbi;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
+import org.apache.ode.bpel.iapi.MessageExchange.Status;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.jbi.msgmap.Mapper;
+import org.apache.ode.jbi.msgmap.MessageTranslationException;
+import org.w3c.dom.Element;
import javax.jbi.JBIException;
import javax.jbi.messaging.ExchangeStatus;
@@ -30,17 +38,8 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
-import org.apache.ode.bpel.iapi.MessageExchange.Status;
-import org.apache.ode.jbi.msgmap.Mapper;
-import org.apache.ode.jbi.msgmap.MessageTranslationException;
-import org.w3c.dom.Element;
+import java.util.HashMap;
+import java.util.Map;
/**
* Bridge JBI (consumer) to ODE (provider).
@@ -212,6 +211,7 @@
}
odeMex = _ode._server.getEngine().createMessageExchange(jbiMex.getExchangeId(), _endpoint.serviceName,
jbiMex.getOperation().getLocalPart());
+ MessageExchangePattern pattern = odeMex.getMessageExchangePattern();
if (odeMex.getOperation() != null) {
copyMexProperties(odeMex, jbiMex);
@@ -244,7 +244,7 @@
success = true;
// For one-way invocation we do not need to maintain the association
- if (odeMex.getMessageExchangePattern() != MessageExchangePattern.REQUEST_RESPONSE)
+ if (pattern != MessageExchangePattern.REQUEST_RESPONSE)
_jbiMexTracker.consume(jbiMex.getExchangeId());
} finally {