You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/06/06 19:42:24 UTC
[1/3] activemq-artemis git commit: Revert "ARTEMIS-539"
Repository: activemq-artemis
Updated Branches:
refs/heads/master 29a0d273d -> 25316e423
Revert "ARTEMIS-539"
This reverts commit a3efafd97593af22d5b0140e16bf6c320a13bb3f.
This reverts commit cf3396a3a605081dfb30b222a745bd803858fb70.
This reverts commit 17ea05bce666e27b9a2808f4a186307ef92c1b2b.
This reverts commit af4aa9fcb67431dc04ac6d13584391925f691ae4.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8fdd1f64
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8fdd1f64
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8fdd1f64
Branch: refs/heads/master
Commit: 8fdd1f64960a3449403bd325a536b4ba6ea421dd
Parents: 29a0d27
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jun 6 14:11:48 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jun 6 14:12:25 2016 -0400
----------------------------------------------------------------------
.../impl/ClientProducerCreditManagerImpl.java | 4 -
.../core/client/impl/ClientSessionImpl.java | 7 +-
.../core/server/impl/ServerSessionImpl.java | 16 +-
.../client/MultipleProducersTest.java | 171 -------------------
4 files changed, 5 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8fdd1f64/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
index 52fcdd4..32ada4f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
@@ -79,10 +79,6 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana
// while this is still sending requests causing a dead lock
if (needInit) {
credits.init(context);
-
- // Setting default address on the session
- session.setAddress(null, address);
-
}
return credits;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8fdd1f64/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 15cdccd..ae8966c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1052,14 +1052,11 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void setAddress(final Message message, final SimpleString address) {
if (defaultAddress == null) {
- logger.tracef("setAddress() Setting default address as %s", address);
defaultAddress = address;
- if (message != null) {
- message.setAddress(address);
- }
+ message.setAddress(address);
}
- else if (message != null) {
+ else {
if (!address.equals(defaultAddress)) {
message.setAddress(address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8fdd1f64/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index f5cbaf3..a4c1438 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -1233,7 +1233,9 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
SimpleString address = message.getAddress();
- checkDefaultAddress(address);
+ if (defaultAddress == null && address != null) {
+ defaultAddress = address;
+ }
if (address == null) {
if (message.isDurable()) {
@@ -1267,14 +1269,6 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
return result;
}
- protected void checkDefaultAddress(SimpleString address) {
- logger.tracef("checkDefaultAddress %s, defaultAddress=%s", address, defaultAddress);
- if (defaultAddress == null && address != null) {
- logger.tracef("checkDefaultAddress setting as %s", address);
- defaultAddress = address;
- }
- }
-
@Override
public void sendContinuations(final int packetSize,
final long messageBodySize,
@@ -1304,10 +1298,6 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public void requestProducerCredits(final SimpleString address, final int credits) throws Exception {
- // When the client gets the producer credits it already has the intention of sending messages
- // and it will already register the default address on the core protocol
- // hence we need to set it here when we request credits as well
- checkDefaultAddress(address);
PagingStore store = server.getPagingManager().getPageStore(address);
if (!store.checkMemory(new Runnable() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8fdd1f64/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
deleted file mode 100644
index e830095..0000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.artemis.tests.integration.client;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
-import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
-import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
-import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
-import org.apache.activemq.artemis.tests.util.JMSTestBase;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class MultipleProducersTest extends JMSTestBase {
-
- public Connection conn;
- public Queue queueOne = null;
- public Queue queueTwo = null;
- public Session session = null;
-
- public SimpleString dlq = new SimpleString("jms.queue.DLQ");
- public SimpleString expiryQueue = new SimpleString("jms.queue.ExpiryQueue");
-
- public SimpleString queueOneName = new SimpleString("jms.queue.queueOne");
- public SimpleString queueTwoName = new SimpleString("jms.queue.queueTwo");
- public JMSQueueControl control = null;
- public long queueOneMsgCount = 0;
- public long queueTwoMsgCount = 0;
-
- @Before
- public void iniTest() throws Exception {
-
- }
-
- @Test
- public void wrongQueue() throws Exception {
-
- conn = cf.createConnection();
-
- session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- HierarchicalRepository<AddressSettings> repos = server.getAddressSettingsRepository();
-
- AddressSettings addressSettings = new AddressSettings();
-
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
- addressSettings.setExpiryAddress(dlq);
- addressSettings.setDeadLetterAddress(expiryQueue);
- addressSettings.setRedeliveryDelay(0);
- addressSettings.setMessageCounterHistoryDayLimit(2);
- addressSettings.setLastValueQueue(false);
- addressSettings.setMaxDeliveryAttempts(10);
- addressSettings.setMaxSizeBytes(1048576);
- addressSettings.setPageCacheMaxSize(5);
- addressSettings.setPageSizeBytes(2097152);
- addressSettings.setRedistributionDelay(-1);
- addressSettings.setSendToDLAOnNoRoute(false);
- addressSettings.setSlowConsumerCheckPeriod(5);
- addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY);
- addressSettings.setSlowConsumerThreshold(-1);
-
- repos.setDefault(addressSettings);
-
- queueOne = createQueue("queueOne");
-
- queueTwo = createQueue("queueTwo");
-
- try {
- while (true) {
- sendMessage(queueOne, session);
- }
- }
- catch (Throwable t) {
- // expected
- }
-
- session.close();
-
- conn.close();
-
- session = null;
- conn = null;
-
- conn = cf.createConnection();
- session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // send a message to a queue which is already full
- // result an exception
- try {
- sendMessage(queueOne, session);
- Assert.fail("Exception expected");
- }
- catch (Exception t) {
- }
-
- // send 5 message to queueTwo
- // there shoudl be 5 messages on queueTwo
- for (int i = 0; i < 5; i++) {
- sendMessage(queueTwo, session);
- }
-
- // before sending any messages to queueOne it has to be drained.
- // after draining queueOne send 5 message to queueOne
- queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();
-
- control = (JMSQueueControl) server.getManagementService().getResource(ResourceNames.JMS_QUEUE + queueOne.getQueueName());
-
- control.removeMessages(null);
-
- for (int i = 0; i < 5; i++) {
- sendMessage(queueOne, session);
- }
-
- // at the end of the test there shoudl be 5 message on queueOne and 5 messages on queueTwo
-
- session.close();
-
- conn.close();
-
- queueOneMsgCount = server.locateQueue(queueOneName).getMessageCount();
-
- queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();
-
- Assert.assertEquals("queueTwo message count", 5, queueTwoMsgCount);
- Assert.assertEquals("queueOne message count", 5, queueOneMsgCount);
-
- }
-
- private void sendMessage(Queue queue, Session session) throws Exception {
-
- MessageProducer mp = session.createProducer(queue);
-
- try {
- mp.setDisableMessageID(true);
- mp.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
- mp.setPriority(Message.DEFAULT_PRIORITY);
- mp.setTimeToLive(Message.DEFAULT_TIME_TO_LIVE);
-
- mp.send(session.createTextMessage("This is message for " + queue.getQueueName()));
- }
- finally {
-
- mp.close();
- }
- }
-}
[3/3] activemq-artemis git commit: This closes #562
Posted by jb...@apache.org.
This closes #562
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/25316e42
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/25316e42
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/25316e42
Branch: refs/heads/master
Commit: 25316e4232a9046297582fe424f2c86b4976477e
Parents: 29a0d27 a405581
Author: jbertram <jb...@apache.org>
Authored: Mon Jun 6 14:41:21 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Mon Jun 6 14:41:21 2016 -0500
----------------------------------------------------------------------
.../impl/ClientProducerCreditManagerImpl.java | 4 ---
.../core/client/impl/ClientProducerImpl.java | 30 +++++++-------------
.../core/client/impl/ClientSessionImpl.java | 18 ++++++++----
.../core/client/impl/ClientSessionInternal.java | 3 ++
.../core/server/impl/ServerSessionImpl.java | 16 ++---------
.../client/MultipleProducersTest.java | 1 +
6 files changed, 31 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: ARTEMIS-539 Proper fix on default
address for core protocol
Posted by jb...@apache.org.
ARTEMIS-539 Proper fix on default address for core protocol
The previous fix was breaking compatibility with older servers.
We need to check the default address if an exception happened during the send (due to flow control or blocker)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a4055816
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a4055816
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a4055816
Branch: refs/heads/master
Commit: a4055816b315697d4084564732e14ce17434c01f
Parents: 8fdd1f6
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jun 6 14:37:43 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jun 6 15:38:29 2016 -0400
----------------------------------------------------------------------
.../core/client/impl/ClientProducerImpl.java | 30 ++--
.../core/client/impl/ClientSessionImpl.java | 13 +-
.../core/client/impl/ClientSessionInternal.java | 3 +
.../client/MultipleProducersTest.java | 172 +++++++++++++++++++
4 files changed, 198 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a4055816/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index 392454e..99e593f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -210,10 +210,13 @@ public class ClientProducerImpl implements ClientProducerInternal {
closed = true;
}
- private void doSend(final SimpleString address1,
+ private void doSend(SimpleString sendingAddress,
final Message msg,
final SendAcknowledgementHandler handler,
final boolean forceAsync) throws ActiveMQException {
+ if (sendingAddress == null) {
+ sendingAddress = this.address;
+ }
session.startCall();
try {
@@ -233,28 +236,16 @@ public class ClientProducerImpl implements ClientProducerInternal {
isLarge = false;
}
- if (address1 != null) {
- if (!isLarge) {
- session.setAddress(msg, address1);
- }
- else {
- msg.setAddress(address1);
- }
-
- // Anonymous
- theCredits = session.getCredits(address1, true);
+ if (!isLarge) {
+ session.setAddress(msg, sendingAddress);
}
else {
- if (!isLarge) {
- session.setAddress(msg, this.address);
- }
- else {
- msg.setAddress(this.address);
- }
-
- theCredits = producerCredits;
+ msg.setAddress(sendingAddress);
}
+ // Anonymous
+ theCredits = session.getCredits(sendingAddress, true);
+
if (rateLimiter != null) {
// Rate flow control
@@ -276,6 +267,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
}
else {
sendRegularMessage(msgI, sendBlocking, theCredits, handler);
+ session.checkDefaultAddress(sendingAddress);
}
}
finally {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a4055816/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index ae8966c..c329bbd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1052,21 +1052,32 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void setAddress(final Message message, final SimpleString address) {
if (defaultAddress == null) {
- defaultAddress = address;
+ logger.tracef("setAddress() Setting default address as %s", address);
message.setAddress(address);
}
else {
if (!address.equals(defaultAddress)) {
+ logger.tracef("setAddress() setting non default address %s on message", address);
message.setAddress(address);
}
else {
+ logger.trace("setAddress() being set as null");
message.setAddress(null);
}
}
}
@Override
+ public void checkDefaultAddress(SimpleString address) {
+ if (defaultAddress == null) {
+ logger.tracef("checkDefaultAddress(%s)", address);
+ defaultAddress = address;
+ }
+ }
+
+
+ @Override
public void setPacketSize(final int packetSize) {
if (packetSize > this.initialMessagePacketSize) {
this.initialMessagePacketSize = (int) (packetSize * 1.2);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a4055816/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
index 30c8404..b25e1a8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
@@ -87,8 +87,11 @@ public interface ClientSessionInternal extends ClientSession {
ClientProducerCreditManager getProducerCreditManager();
+ /** This will set the address at the message */
void setAddress(Message message, SimpleString address);
+ void checkDefaultAddress(SimpleString address);
+
void setPacketSize(int packetSize);
void resetIfNeeded() throws ActiveMQException;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a4055816/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
new file mode 100644
index 0000000..4aedc98
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
@@ -0,0 +1,172 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.tests.integration.client;
+
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MultipleProducersTest extends JMSTestBase {
+
+ public Connection conn;
+ public Queue queueOne = null;
+ public Queue queueTwo = null;
+ public Session session = null;
+
+ public SimpleString dlq = new SimpleString("jms.queue.DLQ");
+ public SimpleString expiryQueue = new SimpleString("jms.queue.ExpiryQueue");
+
+ public SimpleString queueOneName = new SimpleString("jms.queue.queueOne");
+ public SimpleString queueTwoName = new SimpleString("jms.queue.queueTwo");
+ public JMSQueueControl control = null;
+ public long queueOneMsgCount = 0;
+ public long queueTwoMsgCount = 0;
+
+ @Before
+ public void iniTest() throws Exception {
+
+ }
+
+ @Test
+ public void wrongQueue() throws Exception {
+
+ conn = cf.createConnection();
+
+ session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ HierarchicalRepository<AddressSettings> repos = server.getAddressSettingsRepository();
+
+ AddressSettings addressSettings = new AddressSettings();
+
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
+ addressSettings.setExpiryAddress(dlq);
+ addressSettings.setDeadLetterAddress(expiryQueue);
+ addressSettings.setRedeliveryDelay(0);
+ addressSettings.setMessageCounterHistoryDayLimit(2);
+ addressSettings.setLastValueQueue(false);
+ addressSettings.setMaxDeliveryAttempts(10);
+ addressSettings.setMaxSizeBytes(1048576);
+ addressSettings.setPageCacheMaxSize(5);
+ addressSettings.setPageSizeBytes(2097152);
+ addressSettings.setRedistributionDelay(-1);
+ addressSettings.setSendToDLAOnNoRoute(false);
+ addressSettings.setSlowConsumerCheckPeriod(5);
+ addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY);
+ addressSettings.setSlowConsumerThreshold(-1);
+
+ repos.setDefault(addressSettings);
+
+ queueOne = createQueue("queueOne");
+
+ queueTwo = createQueue("queueTwo");
+
+ try {
+ while (true) {
+ sendMessage(queueOne, session);
+ }
+ }
+ catch (Throwable t) {
+// t.printStackTrace();
+ // expected
+ }
+
+ session.close();
+
+ conn.close();
+
+ session = null;
+ conn = null;
+
+ conn = cf.createConnection();
+ session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // send a message to a queue which is already full
+ // result an exception
+ try {
+ sendMessage(queueOne, session);
+ Assert.fail("Exception expected");
+ }
+ catch (Exception t) {
+ }
+
+ // send 5 message to queueTwo
+ // there shoudl be 5 messages on queueTwo
+ for (int i = 0; i < 5; i++) {
+ sendMessage(queueTwo, session);
+ }
+
+ // before sending any messages to queueOne it has to be drained.
+ // after draining queueOne send 5 message to queueOne
+ queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();
+
+ control = (JMSQueueControl) server.getManagementService().getResource(ResourceNames.JMS_QUEUE + queueOne.getQueueName());
+
+ control.removeMessages(null);
+
+ for (int i = 0; i < 5; i++) {
+ sendMessage(queueOne, session);
+ }
+
+ // at the end of the test there shoudl be 5 message on queueOne and 5 messages on queueTwo
+
+ session.close();
+
+ conn.close();
+
+ queueOneMsgCount = server.locateQueue(queueOneName).getMessageCount();
+
+ queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();
+
+ Assert.assertEquals("queueTwo message count", 5, queueTwoMsgCount);
+ Assert.assertEquals("queueOne message count", 5, queueOneMsgCount);
+
+ }
+
+ private void sendMessage(Queue queue, Session session) throws Exception {
+
+ MessageProducer mp = session.createProducer(queue);
+
+ try {
+ mp.setDisableMessageID(true);
+ mp.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ mp.setPriority(Message.DEFAULT_PRIORITY);
+ mp.setTimeToLive(Message.DEFAULT_TIME_TO_LIVE);
+
+ mp.send(session.createTextMessage("This is message for " + queue.getQueueName()));
+ }
+ finally {
+
+ mp.close();
+ }
+ }
+}