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-6150 

code cleanup
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-02-01 13:04:07 +00:00
parent 9361bc6a0f
commit 161730fda2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java
View File

@ -31,9 +31,7 @@ import javax.resource.spi.UnavailableException;
import javax.resource.spi.endpoint.MessageEndpoint;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQQueueSession;
import org.apache.activemq.ActiveMQSession;
import org.apache.activemq.ActiveMQTopicSession;
import org.apache.activemq.command.MessageDispatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -76,11 +74,11 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
if (activationSpec.isUseRAManagedTransactionEnabled()) {
// The RA will manage the transaction commit.
endpoint = createEndpoint(null);
return new ServerSessionImpl(this, (ActiveMQSession)session, activeMQAsfEndpointWorker.workManager, endpoint, true, batchSize);
return new ServerSessionImpl(this, session, activeMQAsfEndpointWorker.workManager, endpoint, true, batchSize);
} else {
// Give the container an object to manage to transaction with.
endpoint = createEndpoint(new LocalAndXATransaction(session.getTransactionContext()));
return new ServerSessionImpl(this, (ActiveMQSession)session, activeMQAsfEndpointWorker.workManager, endpoint, false, batchSize);
return new ServerSessionImpl(this, session, activeMQAsfEndpointWorker.workManager, endpoint, false, batchSize);
}
} catch (UnavailableException e) {
// The container could be limiting us on the number of endpoints
@ -102,6 +100,7 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
/**
*/
@Override
public ServerSession getServerSession() throws JMSException {
if (LOG.isDebugEnabled()) {
LOG.debug("ServerSession requested.");
@ -226,12 +225,12 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
}
try {
ActiveMQSession session = (ActiveMQSession)ss.getSession();
List l = session.getUnconsumedMessages();
List<MessageDispatch> l = session.getUnconsumedMessages();
if (!l.isEmpty()) {
ActiveMQConnection connection = activeMQAsfEndpointWorker.getConnection();
if (connection != null) {
for (Iterator i = l.iterator(); i.hasNext();) {
MessageDispatch md = (MessageDispatch)i.next();
for (Iterator<MessageDispatch> i = l.iterator(); i.hasNext();) {
MessageDispatch md = i.next();
if (connection.hasDispatcher(md.getConsumerId())) {
dispatchToSession(md);
LOG.trace("on remove of {} redispatch of {}", session, md);