Fix issue with the ordering of event on the server side.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / JmsAgent.java

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 90818a572d0524c87a2bd7241560313af0204aa4..d7ca51117467e6fe840a81901aa275397d60229a 100644 (file)
--- 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
@@ -134,29 +134,21 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
                        destinationSend = responseDestination;
                }
 
-               new Thread() {
-                       public void run() {
-                               // Send response
-                               jmsTemplate.convertAndSend(destinationSend, response,
-                                               new MessagePostProcessor() {
-                                                       public Message postProcessMessage(
-                                                                       Message messageToSend) throws JMSException {
-                                                               messageToSend.setStringProperty(PROPERTY_QUERY,
-                                                                               query);
-                                                               messageToSend.setStringProperty(
-                                                                               PROPERTY_SLC_AGENT_ID, agentDescriptor
-                                                                                               .getUuid());
-                                                               messageToSend
-                                                                               .setJMSCorrelationID(correlationId);
-                                                               return messageToSend;
-                                                       }
-                                               });
-                               if (log.isDebugEnabled())
-                                       log.debug("Sent response to query '" + query
-                                                       + "' with correlationId " + correlationId);
-                       }
-               }.start();
-
+               // Send response
+               jmsTemplate.convertAndSend(destinationSend, response,
+                               new MessagePostProcessor() {
+                                       public Message postProcessMessage(Message messageToSend)
+                                                       throws JMSException {
+                                               messageToSend.setStringProperty(PROPERTY_QUERY, query);
+                                               messageToSend.setStringProperty(PROPERTY_SLC_AGENT_ID,
+                                                               agentDescriptor.getUuid());
+                                               messageToSend.setJMSCorrelationID(correlationId);
+                                               return messageToSend;
+                                       }
+                               });
+               if (log.isTraceEnabled())
+                       log.debug("Sent response to query '" + query
+                                       + "' with correlationId " + correlationId);
        }
 
        /** @return response */
@@ -174,8 +166,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
                                agentDescriptorToSend.setModuleDescriptors(lst);
                                return agentDescriptorToSend;
                        } else if ("runSlcExecution".equals(query)) {
-                               SlcExecution slcExecution = (SlcExecution) convertFrom(message);
-                               runSlcExecution(slcExecution);
+                               final SlcExecution slcExecution = (SlcExecution) convertFrom(message);
+                               new Thread() {
+                                       public void run() {
+                                               runSlcExecution(slcExecution);
+                                       }
+                               }.start();
                                return ExecutionAnswer.ok("Execution started on agent "
                                                + agentDescriptor.getUuid());
                        } else if ("ping".equals(query)) {