Merge pull request #1157 from ISISComputingGroup/Ticket5561_fix_ioc_log

Fix log issue by restarting correctly

Author: FreddieAkeroyd

base/uk.ac.stfc.isis.ibex.activemq/src/uk/ac/stfc/isis/ibex/activemq/ReceiveSession.java

@@ -166,6 +166,7 @@ private void addConsumer(String dest, MessageParser parser) {
     protected void addConsumer(Destination dest, MessageParser parser) throws JMSException {
         MessageConsumer consumer = session.createConsumer(dest);
         parser.setActiveMQConsumer(consumer);
+        parser.setRunning(true);
     }
 
     /**

base/uk.ac.stfc.isis.ibex.activemq/src/uk/ac/stfc/isis/ibex/activemq/message/MessageParser.java

@@ -39,21 +39,12 @@ public abstract class MessageParser<T extends IMessage> implements Runnable {
 
     private static final int TIMEOUT_50_MS = 50;
     private boolean running = true;
-    private Thread thread;
+    private Thread thread = null;
 
     private List<IMessageConsumer<T>> convertedConsumers = new ArrayList<>();
 
     /** Receives messages from the JMS server */
     private MessageConsumer jmsConsumer;
-    
-    /**
-     * Default constructor, will start a thread listening for active MQ
-     * messages.
-     */
-    public MessageParser() {
-        thread = new Thread(this);
-        thread.start();
-    }
 
     /**
      * Start and stop the thread.
@@ -66,6 +57,10 @@ public void setRunning(boolean run) {
     		throw new IllegalStateException("Cannot start running without a consumer");
     	}
         running = run;
+        if(running && (thread == null || !thread.isAlive())) {
+        	thread = new Thread(this);
+            thread.start();
+        }
     }
 
     /**
@@ -85,6 +80,7 @@ public void setActiveMQConsumer(MessageConsumer consumer) {
      *             Thrown if close fails.
      */
     public void closeJMSConsumer() throws JMSException {
+        setRunning(false);
         jmsConsumer.close();
 
         /**
@@ -100,7 +96,6 @@ public void closeJMSConsumer() throws JMSException {
          * 
          */
         jmsConsumer = null;
-        setRunning(false);
     }
 
     /**