Add license headers

[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..8df639aa336031ff9f4f36ff0a123f8a9bdddbba 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,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.jms;
 
 import java.util.Enumeration;
@@ -24,8 +40,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 +60,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);
                }
        }