diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-06-28 20:32:35 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-06-28 20:32:35 +0200 |
commit | c54157061aba2730cbaa428d2b5b80001efa4a25 (patch) | |
tree | 2bd3f0d3a917ebf16d81b8562c7926f34028afef /container-disc | |
parent | fe34fc0746fc5fb9a131d83595fd48ba5b1f680c (diff) |
Model inference initial commit
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 932d31c0036..8d54c04d084 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -203,7 +203,7 @@ public final class ConfiguredApplication implements Application { // Block until new config arrives, and it should be applied configurer.getNewComponentGraph(builder.guiceModules().activate(), qrConfig.restartOnDeploy()); intitializeAndActivateContainer(builder); - } catch (ConfigInterruptedException | InterruptedException e) { + } catch (ConfigInterruptedException e) { break; } catch (Exception | LinkageError e) { // LinkageError: OSGi problems log.log(Level.SEVERE, @@ -256,13 +256,12 @@ public final class ConfiguredApplication implements Application { } private void configureComponents(Injector discInjector) { - configurer = new HandlersConfigurerDi( - subscriberFactory, - Container.get(), - configId, - new Deconstructor(true), - discInjector, - osgiFramework); + configurer = new HandlersConfigurerDi(subscriberFactory, + Container.get(), + configId, + new Deconstructor(true), + discInjector, + osgiFramework); } private void setupGuiceBindings(GuiceRepository modules) { |