svn commit: r645999 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: ActiveMQConnection.java ActiveMQConnectionFactory.java ActiveMQSession.java ActiveMQXAConnection.java

[rajdavies]

Author: rajdavies
Date: Tue Apr  8 10:00:13 2008
New Revision: 645999

URL: http://svn.apache.org/viewvc?rev=645999&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1646

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=645999&r1=645998&r2=645999&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
 Tue Apr  8 10:00:13 2008
@@ -109,7 +109,7 @@
 
     public final ConcurrentHashMap<ActiveMQTempDestination, 
ActiveMQTempDestination> activeTempDestinations = new 
ConcurrentHashMap<ActiveMQTempDestination, ActiveMQTempDestination>();
 
-    protected boolean dispatchAsync;
+    protected boolean dispatchAsync=true;
     protected boolean alwaysSessionAsync = true;
 
     private TaskRunnerFactory sessionTaskRunner = new 
TaskRunnerFactory("ActiveMQ Session Task", 
ThreadPriorities.INBOUND_CLIENT_SESSION, false, 1000);
@@ -293,7 +293,7 @@
         checkClosedOrFailed();
         ensureConnectionInfoSent();
         return new ActiveMQSession(this, getNextSessionId(), transacted ? 
Session.SESSION_TRANSACTED : (acknowledgeMode == Session.SESSION_TRANSACTED
-            ? Session.AUTO_ACKNOWLEDGE : acknowledgeMode), dispatchAsync, 
alwaysSessionAsync);
+            ? Session.AUTO_ACKNOWLEDGE : acknowledgeMode), isDispatchAsync(), 
isAlwaysSessionAsync());
     }
 
     /**
@@ -694,7 +694,7 @@
         info.setSubscriptionName(subscriptionName);
         info.setSelector(messageSelector);
         info.setPrefetchSize(maxMessages);
-        info.setDispatchAsync(dispatchAsync);
+        info.setDispatchAsync(isDispatchAsync());
 
         // Allows the options on the destination to configure the consumerInfo
         if (info.getDestination().getOptions() != null) {
@@ -1094,7 +1094,7 @@
         info.setSelector(messageSelector);
         info.setPrefetchSize(maxMessages);
         info.setNoLocal(noLocal);
-        info.setDispatchAsync(dispatchAsync);
+        info.setDispatchAsync(isDispatchAsync());
 
         // Allows the options on the destination to configure the consumerInfo
         if (info.getDestination().getOptions() != null) {

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=645999&r1=645998&r2=645999&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 Tue Apr  8 10:00:13 2008
@@ -76,8 +76,8 @@
     protected String userName;
     protected String password;
     protected String clientID;
-    protected boolean dispatchAsync;
-    protected boolean alwaysSessionAsync = true;
+    protected boolean dispatchAsync=true;
+    protected boolean alwaysSessionAsync=true;
 
     JMSStatsImpl factoryStats = new JMSStatsImpl();
 

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=645999&r1=645998&r2=645999&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 Apr  8 10:00:13 2008
@@ -1002,7 +1002,7 @@
         }
         ActiveMQDestination activemqDestination = 
ActiveMQMessageTransformation.transformDestination(destination);
         return new ActiveMQMessageConsumer(this, getNextConsumerId(), 
activemqDestination, null, messageSelector,
-                prefetch, prefetchPolicy.getMaximumPendingMessageLimit(), 
noLocal, false, asyncDispatch, messageListener);
+                prefetch, prefetchPolicy.getMaximumPendingMessageLimit(), 
noLocal, false, isAsyncDispatch(), messageListener);
     }
 
     /**

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java?rev=645999&r1=645998&r2=645999&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
 Tue Apr  8 10:00:13 2008
@@ -69,6 +69,6 @@
     public Session createSession(boolean transacted, int acknowledgeMode) 
throws JMSException {
         checkClosedOrFailed();
         ensureConnectionInfoSent();
-        return new ActiveMQXASession(this, getNextSessionId(), 
Session.SESSION_TRANSACTED, dispatchAsync);
+        return new ActiveMQXASession(this, getNextSessionId(), 
Session.SESSION_TRANSACTED, isDispatchAsync());
     }
 }