Replace assumed dead code branch with require statement.

1 files changed, 5 insertions, 10 deletions

diff --git a/container-di/src/main/scala/com/yahoo/container/di/Container.scala b/container-di/src/main/scala/com/yahoo/container/di/Container.scala
index 50ebff6ece9..5ea6422ddad 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/Container.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/Container.scala
@@ -126,7 +126,11 @@ class Container(
 
     val preventTailRecursion =
       snapshot match {
-        case BootstrapConfigs(configs) if getBootstrapGeneration > previousConfigGeneration =>
+        case BootstrapConfigs(configs) =>
+          // TODO: remove require when proven unnecessary
+          require(getBootstrapGeneration > previousConfigGeneration,
+                  """Got bootstrap configs out of sequence for old config generation %d.
+                    |Previous config generation is %d""".format(getBootstrapGeneration, previousConfigGeneration))
           log.log(DEBUG,
             """Got new bootstrap generation
               |bootstrap generation = %d
@@ -137,15 +141,6 @@ class Container(
           createNewGraph(
             createComponentsGraph(configs, getBootstrapGeneration,fallbackInjector),
             fallbackInjector)
-        case BootstrapConfigs(_) =>
-          // This is an assumed dead code branch, most likely remains from before config set subscriptions were available.
-          log.warning(
-            """Got bootstrap configs with previous generation. (This should not happen.)
-              |bootstrap generation = %d
-              |components generation: %d
-              |previous generation: %d"""
-              .format(getBootstrapGeneration, getComponentsGeneration, previousConfigGeneration).stripMargin)
-          createNewGraph(graph, fallbackInjector)
         case ComponentsConfigs(configs) =>
           log.log(DEBUG,
             """Got components configs,