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

https://issues.apache.org/jira/browse/AMQ-5119 - fix (pfox thanks for the test) the marshalled properties were being retained so a property removal was being ignored before the schedualed resend

This commit is contained in:
gtully 2014-03-27 15:09:12 +00:00
parent 29f34f4dab
commit c07514f570
4 changed files with 181 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-broker/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
View File

@ -178,7 +178,6 @@ public class RedeliveryPlugin extends BrokerPluginSupport {
message.setTransactionId(null);
message.setMemoryUsage(null);
message.setMarshalledProperties(null);
message.removeProperty(ScheduledMessage.AMQ_SCHEDULED_ID);
message.setProperty(REDELIVERY_DELAY, delay);

2
activemq-client/src/main/java/org/apache/activemq/command/Message.java
View File

@ -213,6 +213,8 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
properties = unmarsallProperties(marshalledProperties);
marshalledProperties = null;
}
} else {
marshalledProperties = null;
}
}

167
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/RedeliveryPluginHeaderTest.java Normal file
View File

@ -0,0 +1,167 @@
/**
* 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.bugs;
import java.io.File;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
import org.apache.activemq.broker.util.RedeliveryPlugin;
import org.apache.activemq.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Testing if the the broker "sends" the message as expected after the redeliveryPlugin has redelivered the
* message previously.
*/
public class RedeliveryPluginHeaderTest extends TestCase {
private static final String TEST_QUEUE_ONE = "TEST_QUEUE_ONE";
private static final String TEST_QUEUE_TWO = "TEST_QUEUE_TWO";
private static final Logger LOG = LoggerFactory
.getLogger(RedeliveryPluginHeaderTest.class);
private String transportURL;
private BrokerService broker;
/**
* Test
* - consumes message from Queue1
* - rolls back message to Queue1 and message is scheduled for redelivery to Queue1 by brokers plugin
* - consumes message from Queue1 again
* - sends same message to Queue2
* - expects to consume message from Queue2 immediately
*/
public void testSendAfterRedelivery() throws Exception {
broker = this.createBroker(false);
broker.start();
broker.waitUntilStarted();
LOG.info("***Broker started...");
//pushed message to broker
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(
transportURL + "?trace=true&jms.redeliveryPolicy.maximumRedeliveries=0");
Connection connection = factory.createConnection();
connection.start();
try {
Session session = connection.createSession(true,
Session.SESSION_TRANSACTED);
Destination destinationQ1 = session.createQueue(TEST_QUEUE_ONE);
Destination destinationQ2 = session.createQueue(TEST_QUEUE_TWO);
MessageProducer producerQ1 = session.createProducer(destinationQ1);
producerQ1.setDeliveryMode(DeliveryMode.PERSISTENT);
Message m = session.createTextMessage("testMessage");
LOG.info("*** send message to broker...");
producerQ1.send(m);
session.commit();
//consume message from Q1 and rollback to get it redelivered
MessageConsumer consumerQ1 = session.createConsumer(destinationQ1);
LOG.info("*** consume message from Q1 and rolled back..");
TextMessage textMessage = (TextMessage) consumerQ1.receive();
LOG.info("got redelivered: " + textMessage);
assertFalse("JMSRedelivered flag is not set", textMessage.getJMSRedelivered());
session.rollback();
LOG.info("*** consumed message from Q1 again and sending to Q2..");
TextMessage textMessage2 = (TextMessage) consumerQ1.receive();
LOG.info("got: " + textMessage2);
session.commit();
assertTrue("JMSRedelivered flag is set", textMessage2.getJMSRedelivered());
//send message to Q2 and consume from Q2
MessageConsumer consumerQ2 = session.createConsumer(destinationQ2);
MessageProducer producer_two = session.createProducer(destinationQ2);
producer_two.send(textMessage2);
session.commit();
//Message should be available straight away on the queue_two
Message textMessage3 = consumerQ2.receive(1000);
assertNotNull("should have consumed a message from TEST_QUEUE_TWO", textMessage3);
assertFalse("JMSRedelivered flag is not set", textMessage3.getJMSRedelivered());
session.commit();
} finally {
if (connection != null) {
connection.close();
}
if (broker != null) {
broker.stop();
}
}
}
protected BrokerService createBroker(boolean withJMX) throws Exception {
File schedulerDirectory = new File("target/scheduler");
IOHelper.mkdirs(schedulerDirectory);
IOHelper.deleteChildren(schedulerDirectory);
BrokerService answer = new BrokerService();
answer.setAdvisorySupport(false);
answer.setDataDirectory("target");
answer.setSchedulerDirectoryFile(schedulerDirectory);
answer.setSchedulerSupport(true);
answer.setPersistent(true);
answer.setDeleteAllMessagesOnStartup(true);
answer.setUseJmx(withJMX);
RedeliveryPlugin redeliveryPlugin = new RedeliveryPlugin();
RedeliveryPolicyMap redeliveryPolicyMap = new RedeliveryPolicyMap();
RedeliveryPolicy defaultEntry = new RedeliveryPolicy();
defaultEntry.setInitialRedeliveryDelay(5000);
defaultEntry.setMaximumRedeliveries(5);
redeliveryPolicyMap.setDefaultEntry(defaultEntry);
redeliveryPlugin.setRedeliveryPolicyMap(redeliveryPolicyMap);
answer.setPlugins(new BrokerPlugin[] {redeliveryPlugin});
TransportConnector transportConnector =
answer.addConnector("tcp://localhost:0");
transportURL = transportConnector.getConnectUri().toASCIIString();
return answer;
}
}

12
activemq-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java
View File

@ -85,4 +85,16 @@ public class MessageTest extends DataStructureTestSupport {
assertBeanMarshalls(new MessageId("c1:1:1", 1));
}
public void testPropRemove() throws Exception {
ActiveMQMessage message = new ActiveMQMessage();
message.setStringProperty("RM","RM");
ActiveMQMessage unMarshalled = (ActiveMQMessage) marshalAndUnmarshall(message, wireFormat);
unMarshalled.getBooleanProperty("NA");
unMarshalled.removeProperty("RM");
ActiveMQMessage unMarshalledAgain = (ActiveMQMessage) marshalAndUnmarshall(unMarshalled, wireFormat);
assertNull("Prop is gone", unMarshalledAgain.getProperty("RM"));
}
}