Remove warnings

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / MarshallerMessageConverter.java

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
index 88d40a42645f0425de8c4c2fcc1315416afe0ae2..544152840536d0bfb5589b773a3a741cfd57a648 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
@@ -24,8 +24,14 @@ public class MarshallerMessageConverter implements MessageConverter {
        private Marshaller marshaller;
        private Unmarshaller unmarshaller;
 
+       /** @return the converted message or null if the message itself is null */
+       @SuppressWarnings("unchecked")
        public Object fromMessage(Message message) throws JMSException,
                        MessageConversionException {
+               if (message == null) {
+                       return null;
+               }
+
                if (log.isTraceEnabled()) {
                        Enumeration<String> names = message.getPropertyNames();
                        while (names.hasMoreElements()) {
@@ -38,13 +44,19 @@ public class MarshallerMessageConverter implements MessageConverter {
                if (message instanceof TextMessage) {
 
                        String text = ((TextMessage) message).getText();
+
+                       if (text == null)
+                               throw new SlcException(
+                                               "Cannot unmarshall message without body: " + message);
+
                        try {
                                return unmarshaller.unmarshal(new StringSource(text));
                        } catch (Exception e) {
                                throw new SlcException("Could not unmarshall " + text, e);
                        }
                } else {
-                       throw new SlcException("Only JMS TextMessage are supported.");
+                       throw new SlcException("This type of messages is not supported: "
+                                       + message);
                }
        }