Binder opp queuemanager

Erlend Viddal · Erlend Viddal · commit 9e3b4eeda6dc · 2017-07-28T09:16:40.000+02:00
diff --git a/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/addon/ActiveMqAddon.java b/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/addon/ActiveMqAddon.java
@@ -20,6 +20,7 @@
 import no.obos.util.servicebuilder.mq.activemq.ActiveMqConnectionProvider;
 import no.obos.util.servicebuilder.mq.activemq.ActiveMqListener;
 import no.obos.util.servicebuilder.mq.activemq.ActiveMqSender;
+import no.obos.util.servicebuilder.mq.activemq.QueueManager;
 import org.glassfish.hk2.api.TypeLiteral;
 
 import java.util.Map;
@@ -93,6 +94,7 @@ public void addToJerseyConfig(JerseyConfig serviceConfig) {
         serviceConfig.addBinder((binder) -> {
             binder.bind(this.connectionProvider).to(ActiveMqConnectionProvider.class);
             binder.bind(this.listener).to(MqListener.class);
+            binder.bindAsContract(QueueManager.class);
 
             ImmutableMap<String, MqSender> senderMap = ImmutableMap.copyOf(
                     mqAddon.senders.stream()
diff --git a/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqQueueListener.java b/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqQueueListener.java
@@ -67,10 +67,10 @@ private void toErrorQueue(String text) {
         try {
             log.info("Sending message to error queue: " + text);
             TextMessage errorMessage = session.createTextMessage(text);
-
             Queue queue = session.createQueue(handler.handlerDescription.messageDescription.getErrorQueueName());
             MessageProducer errorProducer = session.createProducer(queue);
             errorProducer.send(errorMessage);
+            errorProducer.close();
         } catch (JMSException jmse) {
             log.error("Failed to create error message", jmse);
         }
@@ -82,6 +82,7 @@ private void toErrorQueue(Message message) {
             Queue queue = session.createQueue(handler.handlerDescription.messageDescription.getErrorQueueName());
             MessageProducer errorProducer = session.createProducer(queue);
             errorProducer.send(message);
+            errorProducer.close();
         } catch (JMSException jmse) {
             log.error("Failed to create error message", jmse);
         }
diff --git a/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqUtils.java b/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqUtils.java
@@ -61,14 +61,6 @@ static void closeConnection(ActiveMQConnection connection) {
         }
     }
 
-    static void closeConnectionNoException(ActiveMQConnection connection) {
-        try {
-            connection.close();
-        } catch (JMSException ex) {
-            log.error("Could not close session connection", ex);
-        }
-    }
-
     static void commitSession(Session session) {
         try {
             session.commit();

Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,6 @@ static void closeConnection(ActiveMQConnection connection) {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- static void closeConnectionNoException(ActiveMQConnection connection) {`
`65`		`- try {`
`66`		`- connection.close();`
`67`		`- } catch (JMSException ex) {`
`68`		`- log.error("Could not close session connection", ex);`
`69`		`- }`
`70`		`- }`
`71`		`-`
`72`	`64`	`static void commitSession(Session session) {`
`73`	`65`	`try {`
`74`	`66`	`session.commit();`