X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FJmsAgent.java;h=90818a572d0524c87a2bd7241560313af0204aa4;hb=56f9a29fc3d208bb1a0e9476b9d67dc372098e70;hp=6882ebaa45b3e16bb7be69d8cf05fac52b285dfc;hpb=a9bd656db864f3f648d375deef6833c2f53f29ba;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
index 6882ebaa4..90818a572 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
@@ -10,7 +10,6 @@ import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
-import javax.jms.TextMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -19,6 +18,7 @@ import org.argeo.slc.core.runtime.AbstractAgent;
 import org.argeo.slc.execution.ExecutionModule;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.msg.ExecutionAnswer;
+import org.argeo.slc.msg.ReferenceList;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
@@ -33,6 +33,8 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 	public final static String PROPERTY_QUERY = "query";
 	public final static String PROPERTY_SLC_AGENT_ID = "slc_agentId";
 
+	public final static String QUERY_PING_ALL = "pingAll";
+
 	private final static Log log = LogFactory.getLog(JmsAgent.class);
 
 	private final SlcAgentDescriptor agentDescriptor;
@@ -114,31 +116,44 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 			throw new SlcException("Cannot analyze incoming message " + message);
 		}
 
-		final Object response = process(query, message);
+		final Object response;
+		final Destination destinationSend;
+		if (QUERY_PING_ALL.equals(query)) {
+			ReferenceList refList = (ReferenceList) convertFrom(message);
+			if (!refList.getReferences().contains(agentDescriptor.getUuid())) {
+				response = agentDescriptor;
+				destinationSend = agentRegister;
+				log.info("Agent #" + agentDescriptor.getUuid()
+						+ " registering to " + agentRegister
+						+ " in reply to a " + QUERY_PING_ALL + " query");
+			} else {
+				return;
+			}
+		} else {
+			response = process(query, message);
+			destinationSend = responseDestination;
+		}
 
 		new Thread() {
 			public void run() {
 				// Send response
-				jmsTemplate.convertAndSend(responseDestination, response,
+				jmsTemplate.convertAndSend(destinationSend, response,
 						new MessagePostProcessor() {
 							public Message postProcessMessage(
 									Message messageToSend) throws JMSException {
-								messageToSend
-										.setStringProperty(
-												PROPERTY_QUERY,
-												message
-														.getStringProperty(PROPERTY_QUERY));
+								messageToSend.setStringProperty(PROPERTY_QUERY,
+										query);
 								messageToSend.setStringProperty(
 										PROPERTY_SLC_AGENT_ID, agentDescriptor
 												.getUuid());
-								messageToSend.setJMSCorrelationID(message
-										.getJMSCorrelationID());
+								messageToSend
+										.setJMSCorrelationID(correlationId);
 								return messageToSend;
 							}
 						});
 				if (log.isDebugEnabled())
-					log.debug("Sent response to query " + query
-							+ " with correlationId " + correlationId);
+					log.debug("Sent response to query '" + query
+							+ "' with correlationId " + correlationId);
 			}
 		}.start();
 
@@ -175,8 +190,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 		}
 	}
 
-	protected Object convertFrom(Message message) throws JMSException {
-		return jmsTemplate.getMessageConverter().fromMessage(message);
+	protected Object convertFrom(Message message) {
+		try {
+			return jmsTemplate.getMessageConverter().fromMessage(message);
+		} catch (JMSException e) {
+			throw new SlcException("Cannot convert message", e);
+		}
 	}
 
 	public void setResponseDestination(Destination responseDestination) {