You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/05/04 05:46:01 UTC
svn commit: r399530 - in
/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq:
ActiveMQConnectionFactory.java broker/region/PrefetchSubscription.java
broker/region/TopicSubscription.java
Author: chirino
Date: Wed May 3 20:45:59 2006
New Revision: 399530
URL: http://svn.apache.org/viewcvs?rev=399530&view=rev
Log:
Enable optimized ack by default again but disable the broker from sending the prefetch resize command to the client.. the client still has not implemented proper thread safe handling for that.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=399530&r1=399529&r2=399530&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Wed May 3 20:45:59 2006
@@ -82,7 +82,7 @@
protected boolean asyncDispatch = false;
protected boolean alwaysSessionAsync=true;
private boolean useAsyncSend = false;
- private boolean optimizeAcknowledge = false;
+ private boolean optimizeAcknowledge = true;
private int closeTimeout = 15000;
private boolean useRetroactiveConsumer;
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=399530&r1=399529&r2=399530&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Wed May 3 20:45:59 2006
@@ -251,6 +251,7 @@
*
*/
public void optimizePrefetch(){
+ /*
if(info!=null&&info.isOptimizedAcknowledge()&&context!=null&&context.getConnection()!=null
&&context.getConnection().isManageable()){
if(info.getCurrentPrefetchSize()!=info.getPrefetchSize() && isLowWaterMark()){
@@ -262,6 +263,7 @@
updateConsumerPrefetch(1);
}
}
+ */
}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java?rev=399530&r1=399529&r2=399530&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java Wed May 3 20:45:59 2006
@@ -271,6 +271,7 @@
*
*/
public void optimizePrefetch(){
+ /*
if(info!=null&&info.isOptimizedAcknowledge()&&context!=null&&context.getConnection()!=null
&&context.getConnection().isManageable()){
if(info.getCurrentPrefetchSize()!=info.getPrefetchSize() && isLowWaterMark()){
@@ -282,6 +283,7 @@
updateConsumerPrefetch(1);
}
}
+ */
}
private void dispatchMatched() throws IOException{