Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ARTEMIS-1475] Fix NPE in ActiveMQMessageHandler#setup 

* initialize ActiveMQActivationSpec#shareSubscriptions to false
* i18n of the exception thrown by ActiveMQMessageHandler if it is not
  possible to create a non-shared subscriber

JIRA: https://issues.apache.org/jira/browse/ARTEMIS-1475
This commit is contained in:
Jeff Mesnil 2017-10-23 14:01:30 +02:00 committed by Clebert Suconic
parent 0ef2c15ab7
commit 16446c1a6e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
View File

@ -24,6 +24,8 @@ import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.MessageLogger;
import javax.jms.IllegalStateException;
/** /**
* Logger Code 15 * Logger Code 15
* <br> * <br>
@ -144,4 +146,7 @@ public interface ActiveMQRALogger extends BasicLogger {
@LogMessage(level = Logger.Level.DEBUG) @LogMessage(level = Logger.Level.DEBUG)
@Message(id = 153001, value = "using different ActiveMQRAConnectionFactory", format = Message.Format.MESSAGE_FORMAT) @Message(id = 153001, value = "using different ActiveMQRAConnectionFactory", format = Message.Format.MESSAGE_FORMAT)
void warnDifferentConnectionfactory(); void warnDifferentConnectionfactory();
@Message(id = 153002, value = "Cannot create a subscriber on the durable subscription since it already has subscriber(s)")
IllegalStateException canNotCreatedNonSharedSubscriber();
} }

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
View File

@ -96,7 +96,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* If this is true, a durable subscription could be shared by multiple MDB instances * If this is true, a durable subscription could be shared by multiple MDB instances
*/ */
private Boolean shareSubscriptions; private Boolean shareSubscriptions = false;
/** /**
* The user * The user

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
View File

@ -122,7 +122,7 @@ public class ActiveMQMessageHandler implements MessageHandler, FailoverEventList
// As a deployed MDB could set up multiple instances in order to process messages in parallel. // As a deployed MDB could set up multiple instances in order to process messages in parallel.
if (sessionNr == 0 && subResponse.getConsumerCount() > 0) { if (sessionNr == 0 && subResponse.getConsumerCount() > 0) {
if (!spec.isShareSubscriptions()) { if (!spec.isShareSubscriptions()) {
throw new javax.jms.IllegalStateException("Cannot create a subscriber on the durable subscription since it already has subscriber(s)"); throw ActiveMQRALogger.LOGGER.canNotCreatedNonSharedSubscriber();
} else if (ActiveMQRALogger.LOGGER.isDebugEnabled()) { } else if (ActiveMQRALogger.LOGGER.isDebugEnabled()) {
logger.debug("the mdb on destination " + queueName + " already had " + logger.debug("the mdb on destination " + queueName + " already had " +
subResponse.getConsumerCount() + subResponse.getConsumerCount() +