VOL-1993 - catch master up with changes from voltha 2.1
Change-Id: I7e38b4abcfa41e33dab4eb8294361917db281710
diff --git a/afrouter/afrouter/binding-router.go b/afrouter/afrouter/binding-router.go
index f545a9d..2602137 100644
--- a/afrouter/afrouter/binding-router.go
+++ b/afrouter/afrouter/binding-router.go
@@ -106,6 +106,7 @@
// Use the name of the backend as the metaVal for this new binding
br.bindings[(*br.currentBackend).name] = *br.currentBackend
return *br.currentBackend, nil
+
} else {
log.Error(err)
sl.err = err
diff --git a/arouterd/arouterd.go b/arouterd/arouterd.go
index 19ebbdc..d53891a 100644
--- a/arouterd/arouterd.go
+++ b/arouterd/arouterd.go
@@ -265,6 +265,7 @@
for {
select {
case <-ctx.Done():
+ break monitorLoop
case msg := <-ch:
log.Debug("Received a device discovery notification")
device := &ic.DeviceDiscovered{}
@@ -280,7 +281,6 @@
log.Error("backend is unknown")
}
}
- break monitorLoop
}
}
}