diff options
author | Saša Živkov <zivkov@gmail.com> | 2012-12-12 01:42:23 -0800 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-12 01:42:23 -0800 |
commit | ef8b0f62034fbf460b4fc82a0954b48e58f5e4f7 (patch) | |
tree | 7f9966e866e7a07013f28c5cfff27b269daa057d | |
parent | 63666d58c4cd3a8e133aadf6c980d3c7cc2c836f (diff) | |
parent | d308a799abdac461bbf17e2a42612ea4546c95e1 (diff) |
Merge "Fix RequestCleanup bug with Git over HTTP" into stable-2.5
-rw-r--r-- | gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index c164d48483..a826c88b81 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java @@ -356,6 +356,9 @@ public class Daemon extends SiteProgram { private Injector createWebInjector() { final List<Module> modules = new ArrayList<Module>(); + if (sshd) { + modules.add(new ProjectQoSFilter.Module()); + } modules.add(RequestContextFilter.module()); modules.add(AllRequestFilter.module()); modules.add(CacheBasedWebSession.module()); @@ -365,7 +368,6 @@ public class Daemon extends SiteProgram { modules.add(new HttpPluginModule()); if (sshd) { modules.add(sshInjector.getInstance(WebSshGlueModule.class)); - modules.add(new ProjectQoSFilter.Module()); } else { modules.add(new NoSshModule()); } |