Event management

[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 dfab1e4bf3ffa79cd8d8b1c017d91d8c8fda20ec..31e6354452a6465987879062daae8586270c5561 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
@@ -1,10 +1,14 @@
 package org.argeo.slc.jms;
 
+import java.util.Enumeration;
+
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.springframework.jms.support.converter.MessageConversionException;
 import org.springframework.jms.support.converter.MessageConverter;
@@ -14,20 +18,44 @@ import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
 public class MarshallerMessageConverter implements MessageConverter {
+       private final static Log log = LogFactory
+                       .getLog(MarshallerMessageConverter.class);
+
        private Marshaller marshaller;
        private Unmarshaller unmarshaller;
 
+       /** @return the converted message or null if the message itself is null */
        public Object fromMessage(Message message) throws JMSException,
                        MessageConversionException {
+               if (message == null) {
+                       return null;
+               }
+
+               if (log.isTraceEnabled()) {
+                       Enumeration<String> names = message.getPropertyNames();
+                       while (names.hasMoreElements()) {
+                               String name = names.nextElement();
+                               log.trace("JMS Property: " + name + "="
+                                               + message.getObjectProperty(name));
+                       }
+               }
+
                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);
                }
        }