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-4426 - queuesender and topicpublisher need to delegate destination tracking, otherwise anonymous publishers return null destination 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463789 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2013-04-02 23:19:16 +00:00
parent 2aed3a708c
commit 059fd2f8c4
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-pool/src/main/java/org/apache/activemq/pool/PooledQueueSender.java
View File

@ -45,7 +45,7 @@ public class PooledQueueSender extends PooledProducer implements QueueSender {
@Override @Override
public Queue getQueue() throws JMSException { public Queue getQueue() throws JMSException {
return getQueueSender().getQueue(); return (Queue) getDestination();
} }
protected ActiveMQQueueSender getQueueSender() { protected ActiveMQQueueSender getQueueSender() {

2
activemq-pool/src/main/java/org/apache/activemq/pool/PooledSession.java
View File

@ -149,7 +149,7 @@ public class PooledSession implements Session, TopicSession, QueueSession, XASes
try { try {
sessionPool.invalidateObject(key, this); sessionPool.invalidateObject(key, this);
} catch (Exception e) { } catch (Exception e) {
throw JMSExceptionSupport.create(e); LOG.trace("Ignoring exception on invalidateObject as discarding session: " + e, e);
} }
} else { } else {
try { try {

2
activemq-pool/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java
View File

@ -35,7 +35,7 @@ public class PooledTopicPublisher extends PooledProducer implements TopicPublish
@Override @Override
public Topic getTopic() throws JMSException { public Topic getTopic() throws JMSException {
return getTopicPublisher().getTopic(); return (Topic) getDestination();
} }
@Override @Override

23
activemq-pool/src/test/java/org/apache/activemq/pool/XAConnectionPoolTest.java
View File

@ -18,7 +18,11 @@ package org.apache.activemq.pool;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector; import java.util.Vector;
import javax.jms.BytesMessage;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory; import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TopicConnection; import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory; import javax.jms.TopicConnectionFactory;
@ -167,4 +171,23 @@ public class XAConnectionPoolTest extends TestSupport {
assertFalse(pcf.isTmFromJndi()); assertFalse(pcf.isTmFromJndi());
} }
public void testSenderAndPublisherDest() throws Exception {
XaPooledConnectionFactory pcf = new XaPooledConnectionFactory();
pcf.setConnectionFactory(new ActiveMQXAConnectionFactory("vm://test?broker.persistent=false"));
QueueConnection connection = pcf.createQueueConnection();
QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueSender sender = session.createSender(session.createQueue("AA"));
assertNotNull(sender.getQueue().getQueueName());
connection.close();
TopicConnection topicConnection = pcf.createTopicConnection();
TopicSession topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicPublisher topicPublisher = topicSession.createPublisher(topicSession.createTopic("AA"));
assertNotNull(topicPublisher.getTopic().getTopicName());
topicConnection.close();
}
} }