Skip to content

FIX lock in MQ producer context #44

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
vharseko merged 4 commits into from
Nov 14, 2022
Merged

FIX lock in MQ producer context #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09733ea
FIX lock in MQ producer context
vharseko Nov 14, 2022
44d8054
Merge branch 'master' of git@github.com:OpenIdentityPlatform/OpenIG.git
vharseko Nov 14, 2022
06ab787
FIX IBM MQ JMSContext ThreadLocal
vharseko Nov 14, 2022
ac852e7
Merge branch 'master' into master
vharseko Nov 14, 2022
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
2 changes: 1 addition & 1 deletion openig-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.2.3.0</version>
<version>9.3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
Expand Down
16 changes: 11 additions & 5 deletions openig-core/src/main/java/org/openidentityplatform/openig/mq/MQ_IBM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ public class MQ_IBM implements Handler{

JmsConnectionFactory cf;

ThreadLocal<JMSContext> jmsContext=new ThreadLocal<JMSContext>() {
@Override
protected JMSContext initialValue() {
return cf.createContext(Session.AUTO_ACKNOWLEDGE);
}
};

@Override
public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
try {
Expand All @@ -53,8 +60,7 @@ public Promise<Response, NeverThrowsException> handle(Context context, Request r
Response response = new Response(Status.NOT_IMPLEMENTED);
return Promises.newResultPromise(response);
}
final JMSContext producerContext=cf.createContext(Session.AUTO_ACKNOWLEDGE);

final JMSContext producerContext=jmsContext.get();
final BytesMessage jmsMessage=producerContext.createBytesMessage();
jmsMessage.setJMSCorrelationID(UUID.randomUUID().toString());
//jmsMessage.setJMSReplyTo(receive);
Expand All @@ -66,9 +72,8 @@ public Promise<Response, NeverThrowsException> handle(Context context, Request r
final JMSProducer producer=producerContext.createProducer();
final Destination dest=producerContext.createQueue(topic);
producer.send(dest, jmsMessage);
producerContext.close();

Response response = new Response(Status.ACCEPTED);
Response response = new Response(Status.ACCEPTED);
return Promises.newResultPromise(response);
}catch (Exception e) {
logger.warn("An error occurred while processing the request: {}", e.toString());
Expand Down Expand Up @@ -104,6 +109,7 @@ public void start() throws HeapException {

handler.cf=JmsFactoryFactory.getInstance(WMQConstants.WMQ_PROVIDER).createConnectionFactory();
handler.cf.setIntProperty(WMQConstants.WMQ_CONNECTION_MODE, WMQConstants.WMQ_CM_CLIENT);
handler.cf.setIntProperty(WMQConstants.WMQ_CLIENT_RECONNECT_OPTIONS, WMQConstants.WMQ_CLIENT_RECONNECT);

handler.cf.setStringProperty(WMQConstants.WMQ_CONNECTION_NAME_LIST, evaluated.get(WMQConstants.WMQ_CONNECTION_NAME_LIST).defaultTo("localhost(1414)").asString() );
handler.cf.setStringProperty(WMQConstants.WMQ_CHANNEL, evaluated.get(WMQConstants.WMQ_CHANNEL).defaultTo("DEV.APP.SVRCONN").asString());
Expand All @@ -124,7 +130,7 @@ public void start() throws HeapException {
@Override
public void run() {
while (true) {
try (JMSContext jmsc=handler.cf.createContext(Session.AUTO_ACKNOWLEDGE)){
try (JMSContext jmsc=handler.jmsContext.get()){
try (JMSConsumer consumer=jmsc.createConsumer(jmsc.createQueue(evaluated.get("topic.consume").asString()))){
while (true){
final Message message=consumer.receive();
Expand Down