diff options
| author | Hugo Arès <hugo.ares@ericsson.com> | 2015-05-13 14:47:10 -0400 |
|---|---|---|
| committer | Saša Živkov <zivkov@gmail.com> | 2015-05-13 21:07:07 +0000 |
| commit | c3bc589e29861c00e6c7da63d108de7a9f52eb53 (patch) | |
| tree | 1a75b5c0d4a0521b121be2743404ad54e5abf6bd | |
| parent | fae221fd47e70045bc686f6fd01086941d8ea92f (diff) | |
Always add SecureStore module in WebAppInitializer
SecureStore module was only added when gerrit_site is found in the
database, not when it's specified as a system property. This was
causing Gerrit initialization error[1] when deploying in a web container
and configuring the site using gerrit.site_path property.
[1] https://groups.google.com/forum/#!topic/repo-discuss/oW7i93mZhRo
Change-Id: Ib723f1c37071142048f30585ab8e7a298c37664e
| -rw-r--r-- | gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java index 4e2365cb87..b365e76ff6 100644 --- a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java +++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java @@ -210,6 +210,7 @@ public class WebAppInitializer extends GuiceServletContextListener private Injector createDbInjector() { final List<Module> modules = new ArrayList<>(); AbstractModule secureStore = createSecureStoreModule(); + modules.add(secureStore); if (sitePath != null) { Module sitePathModule = new AbstractModule() { @Override @@ -243,7 +244,6 @@ public class WebAppInitializer extends GuiceServletContextListener }); } else { - modules.add(secureStore); modules.add(new LifecycleModule() { @Override protected void configure() { |