You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/08/26 10:54:59 UTC

[2/5] brooklyn-server git commit: subscriptions should base on sensor name, not the object

subscriptions should base on sensor name, not the object


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8ff627cb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8ff627cb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8ff627cb

Branch: refs/heads/master
Commit: 8ff627cbbfb104c4dc60341a95e256909439dd57
Parents: 41f723f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Aug 25 16:07:57 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Aug 25 16:17:41 2016 +0100

----------------------------------------------------------------------
 .../core/mgmt/internal/QueueingSubscriptionManager.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8ff627cb/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java
index 8056488..d24e7a4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/QueueingSubscriptionManager.java
@@ -138,8 +138,10 @@ public class QueueingSubscriptionManager extends AbstractSubscriptionManager {
         
         Set<SubscriptionHandle> result = new LinkedHashSet<SubscriptionHandle>();
         for (QueuedSubscription q: queuedSubscriptions) {
-            if ((q.s.sensor==null || Objects.equal(q.s.sensor, sensor)) &&
-                    (q.s.producer==null || Objects.equal(q.s.producer, sensor)))
+            // just match based on sensor name to facilitate yaml
+            // (if subscription has no sensor, that means subscribe to all sensors)
+            if ((q.s.sensor==null || (sensor!=null && Objects.equal(q.s.sensor.getName(), sensor.getName()))) &&
+                    (q.s.producer==null || Objects.equal(q.s.producer, source)))
                 result.add(q.s);
         }
         return result;