commit e82adc6950abc9bbb5cf9293aa072fc3d16901d3
author Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Mon Aug 04 10:59:24 2014 -0700
committer Gerrit Code Review <gerrit2@localhost> Wed Aug 06 16:01:00 2014 -0700
tree 055851e4792d95d5d67ab22a8ed1e44cd0a6e413
parent bb17de27298e5998a206aa4d09281d4d64de0b66

Fix for cleaner thread to not clean configured topology objects.

Change-Id: If76ec078cee53a76530ec49e67cbab556060dd64

src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
index cb7c54f..ed450f2 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -99,6 +99,11 @@
             }
             // For each switch check if a controller exists in controller registry
             for (Switch sw : switches) {
+                // FIXME How to handle case where Switch has never been
+                // registered to ZK
+                if (sw.getConfigState() == ConfigState.CONFIGURED) {
+                    continue;
+                }
                 try {
                     String controller =
                             registryService.getControllerForSwitch(sw.getDpid().value());