Merge "Bug 5543 - Bo: Update JUnit tests part_12"

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / LifecycleConductorImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
index 121100038ba8353ea27909ecdf757b5332ea5c35..d265336b5eaf725dc4afed72700972afcd6c9741 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.openflowplugin.api.openflow.OFPManager;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
@@ -180,6 +179,9 @@ final class LifecycleConductorImpl implements LifecycleConductor, RoleChangeList
                             notificationPublishService,
                             new AtomicLong());
                 }
+
+                // Fill flow registry with flows found in operational and config datastore
+                deviceContext.getDeviceFlowRegistry().fill(deviceInfo.getNodeInstanceIdentifier());
             } else {
                 logText = "Stopp";
                 statisticsManager.stopScheduling(deviceInfo);
@@ -198,7 +200,7 @@ final class LifecycleConductorImpl implements LifecycleConductor, RoleChangeList
 
                 @Override
                 public void onFailure(final Throwable throwable) {
-                    LOG.warn("ing services for node {} was NOT successful, closing connection", logText, deviceInfo);
+                    LOG.warn("{}ing services for node {} was NOT successful, closing connection", logText, deviceInfo);
                     closeConnection(deviceInfo);
                 }
             });