X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FJmsAgentProxy.java;h=a3a8c5487e10ece045665ccd0a38622ee41bc8e5;hb=719f374a748e531ae706115252978e06ad72c308;hp=8837a8155993cdc4c9a04954f45e228c848e3961;hpb=a9bd656db864f3f648d375deef6833c2f53f29ba;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
index 8837a8155..a3a8c5487 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
@@ -14,12 +14,12 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.msg.ExecutionAnswer;
+import org.argeo.slc.msg.MsgConstants;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
-import org.springframework.jms.support.converter.MessageConverter;
 
 public class JmsAgentProxy implements SlcAgent {
 	private final static Log log = LogFactory.getLog(JmsAgentProxy.class);
@@ -28,16 +28,13 @@ public class JmsAgentProxy implements SlcAgent {
 	private final Destination requestDestination;
 	private final Destination responseDestination;
 	private final JmsTemplate jmsTemplate;
-	private final MessageConverter messageConverter;
 
 	public JmsAgentProxy(String agentUuid, Destination requestDestination,
-			Destination responseDestination, JmsTemplate jmsTemplate,
-			MessageConverter messageConverter) {
+			Destination responseDestination, JmsTemplate jmsTemplate) {
 		this.agentUuid = agentUuid;
 		this.requestDestination = requestDestination;
 		this.responseDestination = responseDestination;
 		this.jmsTemplate = jmsTemplate;
-		this.messageConverter = messageConverter;
 	}
 
 	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
@@ -103,7 +100,7 @@ public class JmsAgentProxy implements SlcAgent {
 
 	protected void send(AgentMC messageCreator) {
 		jmsTemplate.send(requestDestination, messageCreator);
-		if (log.isDebugEnabled())
+		if (log.isTraceEnabled())
 			log.debug("Sent query '" + messageCreator.getQuery()
 					+ "' with correlationId "
 					+ messageCreator.getCorrelationId() + " to agent "
@@ -132,13 +129,13 @@ public class JmsAgentProxy implements SlcAgent {
 			else
 				return null;
 		}
-		if (log.isDebugEnabled())
+		if (log.isTraceEnabled())
 			log.debug("Received response for query '" + query
 					+ "' with correlationId " + correlationId + " from agent "
 					+ agentUuid);
 
 		try {
-			return messageConverter.fromMessage(responseMsg);
+			return fromMessage(responseMsg);
 		} catch (Exception e) {
 			throw new SlcException("Could not convert response from agent "
 					+ agentUuid + " with correlationId " + correlationId
@@ -146,6 +143,15 @@ public class JmsAgentProxy implements SlcAgent {
 		}
 	}
 
+	protected Object fromMessage(Message message) throws JMSException {
+		return jmsTemplate.getMessageConverter().fromMessage(message);
+	}
+
+	protected Message toMessage(Object obj, Session session)
+			throws JMSException {
+		return jmsTemplate.getMessageConverter().toMessage(obj, session);
+	}
+
 	protected class AgentMC implements MessageCreator {
 		private final String query;
 		private Object body = null;
@@ -169,11 +175,20 @@ public class JmsAgentProxy implements SlcAgent {
 			if (body == null)
 				msg = session.createTextMessage();
 			else
-				msg = messageConverter.toMessage(body, session);
-			msg.setStringProperty(JmsAgent.PROPERTY_SLC_AGENT_ID, agentUuid);
+				msg = toMessage(body, session);
+			msg.setStringProperty(MsgConstants.PROPERTY_SLC_AGENT_ID, agentUuid);
 			msg.setStringProperty(JmsAgent.PROPERTY_QUERY, query);
 			msg.setJMSCorrelationID(correlationId);
 			setArguments(msg);
+			if (msg instanceof TextMessage) {
+				TextMessage textMessage = (TextMessage) msg;
+				if (textMessage.getText() == null) {
+					// TODO: remove workaround when upgrading to ActiveMQ 5.3
+					// Workaround for
+					// https://issues.apache.org/activemq/browse/AMQ-2046
+					textMessage.setText("");
+				}
+			}
 			return msg;
 		}