Skip to content

Cherry pick release fix #1158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2020
Merged

Cherry pick release fix #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb60fbe
Fix log issue by restarting correctly
JamesKingWork Jul 21, 2020
f98d17a
Update MessageParser.java
FreddieAkeroyd Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/uk.ac.stfc.isis.ibex.activemq/src/uk/ac/stfc/isis/ibex/activemq/ReceiveSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
17 changes: 6 additions & 11 deletions ...k.ac.stfc.isis.ibex.activemq/src/uk/ac/stfc/isis/ibex/activemq/message/MessageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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();
}
}

/**
Expand All @@ -85,6 +80,7 @@ public void setActiveMQConsumer(MessageConsumer consumer) {
* Thrown if close fails.
*/
public void closeJMSConsumer() throws JMSException {
setRunning(false);
jmsConsumer.close();

/**
Expand All @@ -100,7 +96,6 @@ public void closeJMSConsumer() throws JMSException {
*
*/
jmsConsumer = null;
setRunning(false);
}

/**
Expand Down