From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 8 Sep 2014 08:22:23 +0000 (+0000)
Subject: Merge "Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE"
X-Git-Tag: release/helium~128
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=626fd41ecd5357c54b93a555aa3f7789dce586e5;hp=892d518aa992e0a5aa8b1a011881dbaead08c071

Merge "Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE"
---

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
index fd0ddecd1c..e0c16a0806 100644
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
@@ -53,7 +53,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
         super(manager, Flow.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), FlowForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), FlowForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override
diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
index 77ef162204..72e35ce8db 100644
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
@@ -50,7 +50,7 @@ public class GroupForwarder extends AbstractListeningCommiter<Group> {
         super(manager, Group.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), GroupForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), GroupForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override
diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
index 9511fb8775..8a805b0297 100644
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
@@ -50,7 +50,7 @@ public class MeterForwarder extends AbstractListeningCommiter<Meter> {
         super(manager, Meter.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), MeterForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), MeterForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override