diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-07-23 14:03:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 14:03:00 +0200 |
| commit | c22ac79cf445a1917f2e484cc41d8508dbc776bc (patch) | |
| tree | 13297e297eed6cccc2ca85e145cb9dba81c091e1 /container-disc | |
| parent | ce4798777d1991beb72c3df2e54352db3eb1a4ee (diff) | |
| parent | 36805c46674077714af3e076d2a35868534c5b04 (diff) | |
Merge pull request #6444 from vespa-engine/bratseth/java-model-inference
Bratseth/java model inference
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 181d0018278..69a525a2c54 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) { |