activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r800738 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region: Queue.java Topic.java
Date Tue, 04 Aug 2009 11:53:23 GMT
Author: dejanb
Date: Tue Aug  4 11:53:22 2009
New Revision: 800738

URL: http://svn.apache.org/viewvc?rev=800738&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2343 - decouple sendFailIfNoSpace from producer
flow control

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=800738&r1=800737&r2=800738&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Tue Aug  4 11:53:22 2009
@@ -505,10 +505,8 @@
         final ConnectionContext context = producerExchange.getConnectionContext();
         synchronized (sendLock) {
             if (store != null && message.isPersistent()) {
-                if (isProducerFlowControl() && context.isProducerFlowControl() )
{
-                    if (systemUsage.isSendFailIfNoSpace() && systemUsage.getStoreUsage().isFull())
{
-                        throw new javax.jms.ResourceAllocationException("Usage Manager Store
is Full");
-                    }
+                if (systemUsage.isSendFailIfNoSpace() && systemUsage.getStoreUsage().isFull())
{
+                	throw new javax.jms.ResourceAllocationException("Usage Manager Store is
Full");
                 }
                 while (!systemUsage.getStoreUsage().waitForSpace(1000)) {
                     if (context.getStopping().get()) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=800738&r1=800737&r2=800738&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
Tue Aug  4 11:53:22 2009
@@ -399,10 +399,8 @@
 
         if (topicStore != null && message.isPersistent()
                 && !canOptimizeOutPersistence()) {
-            if (isProducerFlowControl() && context.isProducerFlowControl() ) {
-                if (systemUsage.isSendFailIfNoSpace() && systemUsage.getStoreUsage().isFull())
{
-                    throw new javax.jms.ResourceAllocationException("Usage Manager Store
is Full");
-                }
+            if (systemUsage.isSendFailIfNoSpace() && systemUsage.getStoreUsage().isFull())
{
+                throw new javax.jms.ResourceAllocationException("Usage Manager Store is Full");
             }
             while (!systemUsage.getStoreUsage().waitForSpace(1000)) {
                 if (context.getStopping().get()) {



Mime
View raw message