Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / listeners / ChildListener.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
index 0b288d5944833951125f6cb57fb5bf697d1be385..7a505716a2576af502bcd97f12c5ee060ea3345b 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java
@@ -54,14 +54,19 @@ public abstract class ChildListener<P extends DataObject, C extends DataObject,
     }
 
     public void init() throws Exception {
-        registration = registerListener(LogicalDatastoreType.OPERATIONAL, getParentWildCardPath());
+        //registration = registerListener(LogicalDatastoreType.OPERATIONAL, getParentWildCardPath());
     }
 
     protected ListenerRegistration<?> registerListener(final LogicalDatastoreType dsType,
                                                  final InstanceIdentifier wildCard) throws Exception {
+        if (registration != null) {
+            LOG.error("LocalUcast listener already registered");
+            return registration;
+        }
         DataTreeIdentifier<P> treeId = DataTreeIdentifier.create(dsType, wildCard);
         TaskRetryLooper looper = new TaskRetryLooper(STARTUP_LOOP_TICK, STARTUP_LOOP_MAX_RETRIES);
-        return looper.loopUntilNoException(() -> dataBroker.registerDataTreeChangeListener(treeId, this));
+        registration = looper.loopUntilNoException(() -> dataBroker.registerDataTreeChangeListener(treeId, this));
+        return registration;
     }
 
     /**
@@ -116,6 +121,7 @@ public abstract class ChildListener<P extends DataObject, C extends DataObject,
     public void close() {
         if (registration != null) {
             registration.close();
+            registration = null;
         }
     }
 
@@ -145,9 +151,6 @@ public abstract class ChildListener<P extends DataObject, C extends DataObject,
                         case WRITE:
                             if (modification.getDataBefore() == null) {
                                 onParentAdded(change);
-                            } else {
-                                LOG.info("Unexpected write to parent before {}", modification.getDataBefore());
-                                LOG.info("Unexpected write to parent after {}", modification.getDataAfter());
                             }
                             extractDataChanged(iid, modification, updatedMacsGrouped, deletedMacsGrouped);
                             break;