X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FMarshallerMessageConverter.java;h=544152840536d0bfb5589b773a3a741cfd57a648;hb=33a74c7f6ca6a1d3dc084c6dde4e2be3d532d4d6;hp=88d40a42645f0425de8c4c2fcc1315416afe0ae2;hpb=b072c117f63f2bfc3ccdf1614bfbe03877ea15c1;p=gpl%2Fargeo-slc.git

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 88d40a426..544152840 100644
--- 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);
 		}
 	}