activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r912497 - in /activemq/branches/activemq-5.3: ./ activemq-core/src/main/java/org/apache/activemq/advisory/ activemq-core/src/main/java/org/apache/activemq/transport/ activemq-core/src/main/java/org/apache/activemq/transport/stomp/
Date Mon, 22 Feb 2010 07:06:55 GMT
Author: rajdavies
Date: Mon Feb 22 07:06:55 2010
New Revision: 912497

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

Modified:
    activemq/branches/activemq-5.3/   (props changed)
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
  (props changed)
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
  (props changed)

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 07:06:55 2010
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,911812-912087
+/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,911812-912087,912496

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=912497&r1=912496&r2=912497&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
(original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
Mon Feb 22 07:06:55 2010
@@ -334,15 +334,19 @@
         }
     }
     
-    public void isFull(ConnectionContext context,Destination destination,Usage usage) {
-        super.isFull(context,destination, usage);
-        try {
-            ActiveMQTopic topic = AdvisorySupport.getFullAdvisoryTopic(destination.getActiveMQDestination());
-            ActiveMQMessage advisoryMessage = new ActiveMQMessage();           
-            advisoryMessage.setStringProperty(AdvisorySupport.MSG_PROPERTY_USAGE_NAME, usage.getName());
-            fireAdvisory(context, topic,null,null,advisoryMessage);
-        } catch (Exception e) {
-            LOG.warn("Failed to fire message is full advisory");
+    public void isFull(ConnectionContext context, Destination destination, Usage usage) {
+        super.isFull(context, destination, usage);
+        if (AdvisorySupport.isAdvisoryTopic(destination.getActiveMQDestination()) == false)
{
+            try {
+
+                ActiveMQTopic topic = AdvisorySupport.getFullAdvisoryTopic(destination.getActiveMQDestination());
+                ActiveMQMessage advisoryMessage = new ActiveMQMessage();
+                advisoryMessage.setStringProperty(AdvisorySupport.MSG_PROPERTY_USAGE_NAME,
usage.getName());
+                fireAdvisory(context, topic, null, null, advisoryMessage);
+
+            } catch (Exception e) {
+                LOG.warn("Failed to fire message is full advisory");
+            }
         }
     }
     

Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 07:06:55 2010
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,905769,911812-912087
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,905769,911812-912087,912496

Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 07:06:55 2010
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825009-825084,881278-881313,911812-912087
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825009-825084,881278-881313,911812-912087,912496



Mime
View raw message