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

This closes #1414 

This closes #1415 (manually cherry-picking)
This commit is contained in:
Clebert Suconic 2017-07-24 09:41:25 -04:00
parent f749764880 553043393e
commit 2526ecb33a
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
public String strConnectorClassName; public String strConnectorClassName;
public String strConnectionParameters; public String strConnectionParameters;
protected boolean allowLocalTransactions; protected Boolean allowLocalTransactions;
/** /**
* The resource adapter * The resource adapter
@ -83,12 +83,12 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* The acknowledgement mode * The acknowledgement mode
*/ */
private int acknowledgeMode; private Integer acknowledgeMode;
/** /**
* The subscription durability * The subscription durability
*/ */
private boolean subscriptionDurability; private Boolean subscriptionDurability;
/** /**
* The subscription name * The subscription name
@ -98,7 +98,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;
/** /**
* The user * The user
@ -175,7 +175,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @return the useJNDI * @return the useJNDI
*/ */
public boolean isUseJNDI() { public Boolean isUseJNDI() {
if (useJNDI == null) { if (useJNDI == null) {
return ra.isUseJNDI(); return ra.isUseJNDI();
} }
@ -185,7 +185,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @param value the useJNDI to set * @param value the useJNDI to set
*/ */
public void setUseJNDI(final boolean value) { public void setUseJNDI(final Boolean value) {
useJNDI = value; useJNDI = value;
} }
@ -392,7 +392,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @return the acknowledgement mode * @return the acknowledgement mode
*/ */
public int getAcknowledgeModeInt() { public Integer getAcknowledgeModeInt() {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("getAcknowledgeMode()"); ActiveMQRALogger.LOGGER.trace("getAcknowledgeMode()");
} }
@ -435,7 +435,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
* *
* @return The value * @return The value
*/ */
public boolean isSubscriptionDurable() { public Boolean isSubscriptionDurable() {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("isSubscriptionDurable()"); ActiveMQRALogger.LOGGER.trace("isSubscriptionDurable()");
} }
@ -472,7 +472,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @return the shareDurableSubscriptions * @return the shareDurableSubscriptions
*/ */
public boolean isShareSubscriptions() { public Boolean isShareSubscriptions() {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("isShareSubscriptions() = " + shareSubscriptions); ActiveMQRALogger.LOGGER.trace("isShareSubscriptions() = " + shareSubscriptions);
} }
@ -483,7 +483,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @param shareSubscriptions the shareDurableSubscriptions to set * @param shareSubscriptions the shareDurableSubscriptions to set
*/ */
public void setShareSubscriptions(boolean shareSubscriptions) { public void setShareSubscriptions(final Boolean shareSubscriptions) {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("setShareSubscriptions(" + shareSubscriptions + ")"); ActiveMQRALogger.LOGGER.trace("setShareSubscriptions(" + shareSubscriptions + ")");
} }
@ -623,15 +623,15 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
this.localTx = localTx; this.localTx = localTx;
} }
public boolean isRebalanceConnections() { public Boolean isRebalanceConnections() {
return rebalanceConnections; return rebalanceConnections;
} }
public void setRebalanceConnections(boolean rebalanceConnections) { public void setRebalanceConnections(final Boolean rebalanceConnections) {
this.rebalanceConnections = rebalanceConnections; this.rebalanceConnections = rebalanceConnections;
} }
public int getSetupAttempts() { public Integer getSetupAttempts() {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("getSetupAttempts()"); ActiveMQRALogger.LOGGER.trace("getSetupAttempts()");
} }
@ -643,7 +643,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
} }
} }
public void setSetupAttempts(int setupAttempts) { public void setSetupAttempts(final Integer setupAttempts) {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("setSetupAttempts(" + setupAttempts + ")"); ActiveMQRALogger.LOGGER.trace("setSetupAttempts(" + setupAttempts + ")");
} }
@ -651,7 +651,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
this.setupAttempts = setupAttempts; this.setupAttempts = setupAttempts;
} }
public long getSetupInterval() { public Long getSetupInterval() {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("getSetupInterval()"); ActiveMQRALogger.LOGGER.trace("getSetupInterval()");
} }
@ -663,7 +663,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
} }
} }
public void setSetupInterval(long setupInterval) { public void setSetupInterval(final Long setupInterval) {
if (ActiveMQActivationSpec.trace) { if (ActiveMQActivationSpec.trace) {
ActiveMQRALogger.LOGGER.trace("setSetupInterval(" + setupInterval + ")"); ActiveMQRALogger.LOGGER.trace("setSetupInterval(" + setupInterval + ")");
} }
@ -783,7 +783,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
} }
// here for backwards compatibility // here for backwards compatibility
public void setUseDLQ(final boolean b) { public void setUseDLQ(final Boolean b) {
} }
public void setDLQJNDIName(final String name) { public void setDLQJNDIName(final String name) {
@ -792,7 +792,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
public void setDLQHandler(final String handler) { public void setDLQHandler(final String handler) {
} }
public void setDLQMaxResent(final int maxResent) { public void setDLQMaxResent(final Integer maxResent) {
} }
public void setProviderAdapterJNDI(final String jndi) { public void setProviderAdapterJNDI(final String jndi) {
@ -801,16 +801,16 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
/** /**
* @param keepAlive the keepAlive to set * @param keepAlive the keepAlive to set
*/ */
public void setKeepAlive(boolean keepAlive) { public void setKeepAlive(Boolean keepAlive) {
} }
/** /**
* @param keepAliveMillis the keepAliveMillis to set * @param keepAliveMillis the keepAliveMillis to set
*/ */
public void setKeepAliveMillis(long keepAliveMillis) { public void setKeepAliveMillis(Long keepAliveMillis) {
} }
public void setReconnectInterval(long interval) { public void setReconnectInterval(Long interval) {
} }
public void setMinSession(final Integer value) { public void setMinSession(final Integer value) {
@ -819,11 +819,11 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
public void setMaxMessages(final Integer value) { public void setMaxMessages(final Integer value) {
} }
public boolean isAllowLocalTransactions() { public Boolean isAllowLocalTransactions() {
return allowLocalTransactions; return allowLocalTransactions;
} }
public void setAllowLocalTransactions(boolean allowLocalTransactions) { public void setAllowLocalTransactions(final Boolean allowLocalTransactions) {
this.allowLocalTransactions = allowLocalTransactions; this.allowLocalTransactions = allowLocalTransactions;
} }

2
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
View File

@ -139,7 +139,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
spec.setTransactionTimeout(1); spec.setTransactionTimeout(1);
spec.setMaxSession(NUMBER_OF_SESSIONS); spec.setMaxSession(NUMBER_OF_SESSIONS);
spec.setSetupAttempts(-1); spec.setSetupAttempts(-1);
spec.setSetupInterval(100); spec.setSetupInterval(100L);
spec.setResourceAdapter(qResourceAdapter); spec.setResourceAdapter(qResourceAdapter);
spec.setUseJNDI(false); spec.setUseJNDI(false);
spec.setDestinationType("javax.jms.Queue"); spec.setDestinationType("javax.jms.Queue");

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
View File

@ -192,7 +192,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
spec.setRebalanceConnections(true); spec.setRebalanceConnections(true);
spec.setMaxSession(CONSUMER_COUNT); spec.setMaxSession(CONSUMER_COUNT);
spec.setSetupAttempts(5); spec.setSetupAttempts(5);
spec.setSetupInterval(200); spec.setSetupInterval(200L);
spec.setReconnectAttempts(reconnectAttempts); spec.setReconnectAttempts(reconnectAttempts);
spec.setHA(true); // if this isn't true then the topology listener won't get nodeDown notifications spec.setHA(true); // if this isn't true then the topology listener won't get nodeDown notifications
spec.setCallTimeout(500L); // if this isn't set then it may take a long time for tearDown to occur on the MDB connection spec.setCallTimeout(500L); // if this isn't set then it may take a long time for tearDown to occur on the MDB connection