activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r817640 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Date Tue, 22 Sep 2009 12:43:30 GMT
Author: dejanb
Date: Tue Sep 22 12:43:29 2009
New Revision: 817640

URL: http://svn.apache.org/viewvc?rev=817640&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2400 - fixing tab spaces

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.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=817640&r1=817639&r2=817640&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 Sep 22 12:43:29 2009
@@ -412,9 +412,9 @@
             isFull(context, memoryUsage);
             fastProducer(context, producerInfo);
             if (isProducerFlowControl() && context.isProducerFlowControl()) {
-            	final String logMessage = "Usage Manager memory limit reached. Stopping producer
(" + message.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
-    					" See http://activemq.apache.org/producer-flow-control.html for more info";
-            	LOG.info(logMessage);
+                final String logMessage = "Usage Manager memory limit reached. Stopping producer
(" + message.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
+                        " See http://activemq.apache.org/producer-flow-control.html for more
info";
+                LOG.info(logMessage);
                 if (systemUsage.isSendFailIfNoSpace()) {
                     throw new javax.jms.ResourceAllocationException("SystemUsage memory limit
reached");
                 }
@@ -500,14 +500,14 @@
         final ConnectionContext context = producerExchange.getConnectionContext();
         synchronized (sendLock) {
             if (store != null && message.isPersistent()) {
-            	if (systemUsage.getStoreUsage().isFull()) {
-                	final String logMessage = "Usage Manager Store is Full. Stopping producer
(" + message.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
-							" See http://activemq.apache.org/producer-flow-control.html for more info";
-                	LOG.info(logMessage);
-            		if (systemUsage.isSendFailIfNoSpace()) {
-            			throw new javax.jms.ResourceAllocationException(logMessage);
-            		}
-            	}
+                if (systemUsage.getStoreUsage().isFull()) {
+                    final String logMessage = "Usage Manager Store is Full. Stopping producer
(" + message.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
+                            " See http://activemq.apache.org/producer-flow-control.html for
more info";
+                    LOG.info(logMessage);
+                    if (systemUsage.isSendFailIfNoSpace()) {
+                        throw new javax.jms.ResourceAllocationException(logMessage);
+                    }
+                }
                 while (!systemUsage.getStoreUsage().waitForSpace(1000)) {
                     if (context.getStopping().get()) {
                         throw new IOException(
@@ -1287,13 +1287,13 @@
     final void sendMessage(final ConnectionContext context, Message msg) throws Exception
{
         if (!msg.isPersistent() && messages.getSystemUsage() != null) {
         	if (systemUsage.getTempUsage().isFull()) {
-        		final String logMessage = "Usage Manager Temp Store is Full. Stopping producer
(" + msg.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
-						" See http://activemq.apache.org/producer-flow-control.html for more info";
-        		LOG.info(logMessage);
-        		if (systemUsage.isSendFailIfNoSpace()) {
-        			throw new javax.jms.ResourceAllocationException(logMessage);
-        		}
-        	}
+                final String logMessage = "Usage Manager Temp Store is Full. Stopping producer
(" + msg.getProducerId() + ") to prevent flooding " + getActiveMQDestination().getQualifiedName()
+ "." +
+                        " See http://activemq.apache.org/producer-flow-control.html for more
info";
+                LOG.info(logMessage);
+                if (systemUsage.isSendFailIfNoSpace()) {
+                    throw new javax.jms.ResourceAllocationException(logMessage);
+                }
+            }
             messages.getSystemUsage().getTempUsage().waitForSpace();
         }
         synchronized(messages) {



Mime
View raw message