Author: rajdavies Date: Tue Jun 22 20:08:12 2010 New Revision: 957005 URL: http://svn.apache.org/viewvc?rev=957005&view=rev Log: Ensure executor constructed correctly Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=957005&r1=957004&r2=957005&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Tue Jun 22 20:08:12 2010 @@ -206,7 +206,7 @@ public class ActiveMQSession implements protected final LongSequenceGenerator consumerIdGenerator = new LongSequenceGenerator(); protected final LongSequenceGenerator producerIdGenerator = new LongSequenceGenerator(); protected final LongSequenceGenerator deliveryIdGenerator = new LongSequenceGenerator(); - protected final ActiveMQSessionExecutor executor = new ActiveMQSessionExecutor(this); + protected final ActiveMQSessionExecutor executor; protected final AtomicBoolean started = new AtomicBoolean(false); protected final CopyOnWriteArrayList consumers = new CopyOnWriteArrayList(); @@ -253,6 +253,7 @@ public class ActiveMQSession implements setBlobTransferPolicy(connection.getBlobTransferPolicy()); this.scheduler=connection.getScheduler(); this.connectionExecutor=connection.getExecutor(); + this.executor = new ActiveMQSessionExecutor(this); if (connection.isStarted()) { start(); }