activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r786185 - in /activemq/sandbox/activemq-flow: activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/
Date Thu, 18 Jun 2009 17:53:53 GMT
Author: chirino
Date: Thu Jun 18 17:53:53 2009
New Revision: 786185

URL: http://svn.apache.org/viewvc?rev=786185&view=rev
Log:
Fixing the testTopicNoLocal tests in BrokerTest.  It may also fix some other selector issues.


Modified:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java?rev=786185&r1=786184&r2=786185&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java
Thu Jun 18 17:53:53 2009
@@ -44,7 +44,7 @@
      */
     public final void deliver(MessageDelivery message, ISourceController<?> source)
{
         Subscription<MessageDelivery> s = connectedSub;
-        if (s != null) {
+        if (s != null && matches(message)) {
             s.add(message, source, null);
         }
     }

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java?rev=786185&r1=786184&r2=786185&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
Thu Jun 18 17:53:53 2009
@@ -138,6 +138,6 @@
     }
 
     public MessageEvaluationContext createMessageEvaluationContext() {
-        return new OpenwireMessageEvaluationContext();
+        return new OpenwireMessageEvaluationContext(message);
     }
 }

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java?rev=786185&r1=786184&r2=786185&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
Thu Jun 18 17:53:53 2009
@@ -453,9 +453,7 @@
             this.name = info.getConsumerId().toString();
 
             Flow flow = new Flow("broker-" + name + "-outbound", false);
-            if (info.isDurable())
-
-                selector = parseSelector(info);
+            selector = parseSelector(info);
             limiter = new WindowLimiter<MessageDelivery>(true, flow, info.getPrefetchSize(),
info.getPrefetchSize() / 2) {
                 @Override
                 public int getElementSize(MessageDelivery m) {



Mime
View raw message