You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/06/17 23:36:33 UTC
svn commit: r1493950 - in /activemq/trunk:
activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java
activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
Author: tabish
Date: Mon Jun 17 21:36:33 2013
New Revision: 1493950
URL: http://svn.apache.org/r1493950
Log:
fix and test for: https://issues.apache.org/jira/browse/AMQ-4584
Added:
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java (with props)
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java (with props)
Added: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java?rev=1493950&view=auto
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java (added)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java Mon Jun 17 21:36:33 2013
@@ -0,0 +1,26 @@
+package org.apache.activemq.broker.region.policy;
+
+import org.apache.activemq.command.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A {@link DeadLetterStrategy} where each destination has its own individual
+ * DLQ using the subject naming hierarchy.
+ *
+ * @org.apache.xbean.XBean element="discarding" description="Dead Letter Strategy that discards all messages"
+ *
+ */
+public class DiscardingDeadLetterStrategy extends SharedDeadLetterStrategy {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DiscardingDeadLetterStrategy.class);
+
+ @Override
+ public boolean isSendToDeadLetterQueue(Message message) {
+ boolean result = false;
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Discarding message sent to DLQ: " + message.getMessageId() + ", dest: " + message.getDestination());
+ }
+ return result;
+ }
+}
Propchange: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/DiscardingDeadLetterStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java?rev=1493950&view=auto
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java (added)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java Mon Jun 17 21:36:33 2013
@@ -0,0 +1,77 @@
+/**
+ * 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.broker.policy;
+
+import javax.jms.Message;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.DeadLetterStrategy;
+import org.apache.activemq.broker.region.policy.DiscardingDeadLetterStrategy;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ */
+public class DiscardingDeadLetterPolicyTest extends DeadLetterTest {
+ private static final Logger LOG = LoggerFactory.getLogger(DiscardingDeadLetterPolicyTest.class);
+
+ @Override
+ protected BrokerService createBroker() throws Exception {
+ BrokerService broker = super.createBroker();
+
+ PolicyEntry policy = new PolicyEntry();
+ DeadLetterStrategy strategy = new DiscardingDeadLetterStrategy();
+ strategy.setProcessNonPersistent(true);
+ policy.setDeadLetterStrategy(strategy);
+
+ PolicyMap pMap = new PolicyMap();
+ pMap.setDefaultEntry(policy);
+
+ broker.setDestinationPolicy(pMap);
+
+ return broker;
+ }
+
+ @Override
+ protected void doTest() throws Exception {
+ connection.start();
+
+ ActiveMQConnection amqConnection = (ActiveMQConnection) connection;
+ rollbackCount = amqConnection.getRedeliveryPolicy().getMaximumRedeliveries() + 1;
+ LOG.info("Will redeliver messages: " + rollbackCount + " times");
+
+ makeConsumer();
+ makeDlqConsumer();
+
+ sendMessages();
+
+ // now lets receive and rollback N times
+ for (int i = 0; i < messageCount; i++) {
+ consumeAndRollback(i);
+ }
+
+ for (int i = 0; i < messageCount; i++) {
+ Message msg = dlqConsumer.receive(1000);
+ assertNull("Should not be a DLQ message for loop: " + i, msg);
+ }
+ session.commit();
+ }
+}
Propchange: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
------------------------------------------------------------------------------
svn:eol-style = native