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

diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index 4e07e4eab8..781d9fc93c 100644
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
@@ -54,12 +54,16 @@ public class ObjectMessageProcessor extends AbstractMessageProcessor {
     protected Message createJMSMessage(Session session, Object o) {
         try {
 
-            if (!(o instanceof Serializable)) {
-                throw new IllegalStateException("JMS ObjectMessage payload not Serializable: " + o);
-            }
-
             ObjectMessage message = session.createObjectMessage();
-            message.setObject((Serializable)o);
+            
+            if (o != null){
+                if (!(o instanceof Serializable)) {
+                    throw new IllegalStateException("JMS ObjectMessage payload not Serializable: " + o);
+                }
+    
+                message.setObject((Serializable)o);
+            }
+            
             return message;
 
         } catch (JMSException e) {