From: Giovanni Meo <gmeo@cisco.com>
Date: Wed, 2 Oct 2013 19:33:49 +0000 (+0000)
Subject: Revert "Newcomers that register with TopologyManager should get all the existing... 
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~681
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=72f3cf2421324d9282addb7a880784b7ee05de0c

Revert "Newcomers that register with TopologyManager should get all the existing edges"

This reverts commit 72fae1984afe741a93435269545f0346671cf305.

Reverting because it has some cascaded effects.

Change-Id: Iba8490a80ee2343d4875b1a2c5e17da7713099ee
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
---

diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java
index 5a38ecd4a6..b905a8982e 100644
--- a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java
+++ b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
@@ -116,14 +115,6 @@ public class TopologyManagerImpl implements
         if (this.topologyManagerAware != null) {
             log.debug("Adding ITopologyManagerAware: {}", s);
             this.topologyManagerAware.add(s);
-            // Reply all the known edges
-            if (this.edgesDB != null) {
-                List<TopoEdgeUpdate> existingEdges = new ArrayList<TopoEdgeUpdate>();
-                for (Entry<Edge, Set<Property>> entry : this.edgesDB.entrySet()) {
-                    existingEdges.add(new TopoEdgeUpdate(entry.getKey(), entry.getValue(), UpdateType.ADDED));
-                }
-                s.edgeUpdate(existingEdges);
-            }
         }
     }
 
@@ -138,14 +129,6 @@ public class TopologyManagerImpl implements
         if (this.topologyManagerClusterWideAware != null) {
             log.debug("Adding ITopologyManagerClusterWideAware: {}", s);
             this.topologyManagerClusterWideAware.add(s);
-            // Reply all the known edges
-            if (this.edgesDB != null) {
-                List<TopoEdgeUpdate> existingEdges = new ArrayList<TopoEdgeUpdate>();
-                for (Entry<Edge, Set<Property>> entry : this.edgesDB.entrySet()) {
-                    existingEdges.add(new TopoEdgeUpdate(entry.getKey(), entry.getValue(), UpdateType.ADDED));
-                }
-                s.edgeUpdate(existingEdges);
-            }
         }
     }