Author: mriou
Date: Wed Sep 27 12:47:03 2006
New Revision: 450555

URL: http://svn.apache.org/viewvc?view=rev&rev=450555
Log:
Fixed a NPE

Modified:
    
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java

Modified: 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java?view=diff&rev=450555&r1=450554&r2=450555
==============================================================================
--- 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
 (original)
+++ 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
 Wed Sep 27 12:47:03 2006
@@ -105,21 +105,21 @@
                 OMElement reply = null;
                 try {
                     reply = freply.get();
+
+                    final Message response = 
odeMex.createMessage(odeMex.getOperation().getOutput().getMessage().getQName());
+                    Element responseElmt = OMUtils.toDOM(reply);
+                    responseElmt = SOAPUtils.unwrap(responseElmt, _definition,
+                            odeMex.getOperation().getOutput().getMessage(), 
_serviceName);
+                    __log.debug("Received synchronous response for MEX " + 
odeMex);
+                    __log.debug("Message: " + 
DOMUtils.domToString(responseElmt));
+                    response.setMessage(responseElmt);
+                    odeMex.reply(response);
                 } catch (Exception e) {
                     __log.error("We've been interrupted while waiting for 
reply to MEX " + odeMex + "!!!");
                     String errmsg = "Error sending message to Axis2 for ODE 
mex " + odeMex;
                     __log.error(errmsg, e);
                     
odeMex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, 
errmsg, null);
                 }
-
-                final Message response = 
odeMex.createMessage(odeMex.getOperation().getOutput().getMessage().getQName());
-                Element responseElmt = OMUtils.toDOM(reply);
-                responseElmt = SOAPUtils.unwrap(responseElmt, _definition,
-                        odeMex.getOperation().getOutput().getMessage(), 
_serviceName);
-                __log.debug("Received synchronous response for MEX " + odeMex);
-                __log.debug("Message: " + DOMUtils.domToString(responseElmt));
-                response.setMessage(responseElmt);
-                odeMex.reply(response);
             } else
                 serviceClient.fireAndForget(payload);
         } catch (AxisFault axisFault) {


Reply via email to