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 #150 memory leak fix

This commit is contained in:
Clebert Suconic 2015-09-02 17:42:34 -04:00
parent c998e9a445 ea9609c579
commit 3df29ca7f3
2 changed files with 80 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
View File

@ -109,7 +109,9 @@ public final class BindingsImpl implements Bindings {
}
}
bindings.add(binding);
if (!bindings.contains(binding)) {
bindings.add(binding);
}
}
bindingsMap.put(binding.getID(), binding);
@ -141,7 +143,7 @@ public final class BindingsImpl implements Bindings {
bindingsMap.remove(binding.getID());
if (isTrace) {
ActiveMQServerLogger.LOGGER.trace("Removing binding " + binding + " into " + this + " bindingTable: " + debugBindings());
ActiveMQServerLogger.LOGGER.trace("Removing binding " + binding + " from " + this + " bindingTable: " + debugBindings());
}
}
@ -509,54 +511,51 @@ public final class BindingsImpl implements Bindings {
PrintWriter out = new PrintWriter(writer);
out.println("\n***************************************");
out.println("\n**************************************************");
out.println("routingNameBindingMap:");
if (routingNameBindingMap.isEmpty()) {
out.println("EMPTY!");
out.println("\tEMPTY!");
}
for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) {
out.print("key=" + entry.getKey() + ", value=" + entry.getValue());
// for (Binding bind : entry.getValue())
// {
// out.print(bind + ",");
// }
out.println("\tkey=" + entry.getKey() + ", value(s):");
for (Binding bind : entry.getValue()) {
out.println("\t\t" + bind);
}
out.println();
}
out.println();
out.println("RoutingNamePositions:");
out.println("routingNamePositions:");
if (routingNamePositions.isEmpty()) {
out.println("EMPTY!");
out.println("\tEMPTY!");
}
for (Map.Entry<SimpleString, Integer> entry : routingNamePositions.entrySet()) {
out.println("key=" + entry.getKey() + ", value=" + entry.getValue());
out.println("\tkey=" + entry.getKey() + ", value=" + entry.getValue());
}
out.println();
out.println("BindingsMap:");
out.println("bindingsMap:");
if (bindingsMap.isEmpty()) {
out.println("EMPTY!");
out.println("\tEMPTY!");
}
for (Map.Entry<Long, Binding> entry : bindingsMap.entrySet()) {
out.println("Key=" + entry.getKey() + ", value=" + entry.getValue());
out.println("\tkey=" + entry.getKey() + ", value=" + entry.getValue());
}
out.println();
out.println("ExclusiveBindings:");
out.println("exclusiveBindings:");
if (exclusiveBindings.isEmpty()) {
out.println("EMPTY!");
out.println("\tEMPTY!");
}
for (Binding binding : exclusiveBindings) {
out.println(binding);
out.println("\t" + binding);
}
out.println("#####################################################");
out.println("####################################################");
return writer.toString();
}
@ -606,4 +605,7 @@ public final class BindingsImpl implements Bindings {
return pos;
}
public Map<SimpleString, List<Binding>> getRoutingNameBindingMap() {
return routingNameBindingMap;
}
}

58
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
View File

@ -22,15 +22,22 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
import java.util.List;
import java.util.Map;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.core.filter.impl.FilterImpl;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.impl.BindingsImpl;
import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Test;
/**
@ -97,4 +104,53 @@ public class TopicCleanupTest extends JMSTestBase {
}
@Test
public void testWildcardSubscriber() throws Exception {
ActiveMQTopic topic = (ActiveMQTopic) createTopic("topic.A");
Connection conn = cf.createConnection();
conn.start();
try {
Session consumerStarSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumerStar = consumerStarSession.createConsumer(ActiveMQJMSClient.createTopic("topic.*"));
Session consumerASession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumerA = consumerASession.createConsumer(topic);
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producerA = producerSession.createProducer(topic);
TextMessage msg1 = producerSession.createTextMessage("text");
producerA.send(msg1);
consumerStar.close();
consumerA.close();
producerA.send(msg1);
conn.close();
boolean foundStrayRoutingBinding = false;
Bindings bindings = server.getPostOffice().getBindingsForAddress(new SimpleString(((ActiveMQTopic) topic).getAddress()));
Map<SimpleString, List<Binding>> routingNames = ((BindingsImpl) bindings).getRoutingNameBindingMap();
for (SimpleString key : routingNames.keySet()) {
if (!key.toString().equals(topic.getAddress())) {
foundStrayRoutingBinding = true;
assertEquals(0, ((LocalQueueBinding) routingNames.get(key).get(0)).getQueue().getMessageCount());
}
}
assertFalse(foundStrayRoutingBinding);
}
finally {
jmsServer.stop();
jmsServer.start();
try {
conn.close();
}
catch (Throwable igonred) {
}
}
}
}