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

AMQ-1618 Fix check for 'endpoint factory won't let us create any endpoints at all' 

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-4.1@637006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Jencks 2008-03-14 06:38:09 +00:00
parent f06585433b
commit a08344e04d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,7 @@
*/ */
package org.apache.activemq.ra; package org.apache.activemq.ra;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import javax.jms.JMSException; import javax.jms.JMSException;
@ -29,14 +27,14 @@ import javax.jms.Session;
import javax.resource.spi.UnavailableException; import javax.resource.spi.UnavailableException;
import javax.resource.spi.endpoint.MessageEndpoint; import javax.resource.spi.endpoint.MessageEndpoint;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.ActiveMQQueueSession; import org.apache.activemq.ActiveMQQueueSession;
import org.apache.activemq.ActiveMQSession; import org.apache.activemq.ActiveMQSession;
import org.apache.activemq.ActiveMQTopicSession; import org.apache.activemq.ActiveMQTopicSession;
import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
/** /**
* @version $Revision$ $Date$ * @version $Revision$ $Date$
@ -70,7 +68,7 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
if( activationSpec.isUseRAManagedTransactionEnabled() ) { if( activationSpec.isUseRAManagedTransactionEnabled() ) {
// The RA will manage the transaction commit. // The RA will manage the transaction commit.
endpoint = createEndpoint(null); 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 { } else {
// Give the container an object to manage to transaction with. // Give the container an object to manage to transaction with.
endpoint = createEndpoint(new LocalAndXATransaction(session.getTransactionContext())); endpoint = createEndpoint(new LocalAndXATransaction(session.getTransactionContext()));
@ -117,8 +115,9 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
// We may not be able to create a session due to the container // We may not be able to create a session due to the container
// restricting us. // restricting us.
if (ss == null) { if (ss == null) {
if (idleSessions.size() == 0) { if (activeSessions.size() == 0) {
throw new JMSException("Endpoint factory did not allows to any endpoints."); //no idle sessions, no active sessions, and we can't create a new session....
throw new JMSException("Endpoint factory did not allow creation of any endpoints.");
} }
return getExistingServerSession(); return getExistingServerSession();
@ -130,7 +129,7 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
} }
/** /**
* @param message * @param messageDispatch
* @throws JMSException * @throws JMSException
*/ */
private void dispatchToSession(MessageDispatch messageDispatch) throws JMSException { private void dispatchToSession(MessageDispatch messageDispatch) throws JMSException {