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, 5 insertions, 1 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index cf22e400b1..b87a206f03 100644
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
@@ -57,7 +57,11 @@ public class TextMessageProcessor extends AbstractMessageProcessor {
         try {
 
             TextMessage message = session.createTextMessage();
-            message.setText(String.valueOf(o));
+            
+            if (o != null){
+                message.setText(String.valueOf(o));
+            }
+            
             return message;
 
         } catch (JMSException e) {