TUSCANY-2799 Fix NPE in JMS Object wire format when a null object is returned. Add a test also.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741535 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
index bb3c036287..f4eaa78eec 100644
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
+++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
@@ -93,12 +93,11 @@ public class WireFormatJMSObjectServiceInterceptor implements Interceptor {
         JMSBindingContext context = msg.getBindingContext();
         Session session = context.getJmsSession();
 
-        javax.jms.Message responseJMSMsg;
+        javax.jms.Message responseJMSMsg = null;
         if (msg.isFault()) {
             responseJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)msg.getBody());
         } else {
-            Object response = msg.getBody();
-            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, response);
+            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
         } 
     
         msg.setBody(responseJMSMsg);