diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2017-05-22 09:10:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-22 09:10:34 +0200 |
commit | ebbe253e649f38c5fe4dd7cfa8f891f6c0c5fdf4 (patch) | |
tree | b784141ae62262aa4e6955e118fca802c1f673c6 /container-di/src | |
parent | f60037344007efc95942e1c5f6a01b33f964c251 (diff) | |
parent | 0ac6ec67cf9197261b6d0ff4341f2ee163226af0 (diff) |
Merge pull request #2511 from yahoo/revert-2509-gjoranv/disable-logAndDie
Revert "Disable logAndDie upon failing to set up first component graph."
Diffstat (limited to 'container-di/src')
-rw-r--r-- | container-di/src/main/scala/com/yahoo/container/di/Container.scala | 3 |
1 files changed, 1 insertions, 2 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 0bd5b8264d6..2728885e3ac 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 @@ -104,8 +104,7 @@ class Container( val message = newGraphErrorMessage(generation, cause) generation match { - // Disabled, as it breaks application based tests. - // case 0 => logAndDie(message, cause) + case 0 => logAndDie(message, cause) case _ => log.log(Level.WARNING, message, cause) leastGeneration = max(configurer.getComponentsGeneration, configurer.getBootstrapGeneration) + 1 |