From d308a799abdac461bbf17e2a42612ea4546c95e1 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 29 Nov 2012 17:37:16 -0800 Subject: Fix RequestCleanup bug with Git over HTTP Decide if a continution is going to be used early, before the filter that will attempt to cleanup a RequestCleanup. If so don't allow entering the RequestCleanup part of the system until the request is actually going to be processed. Change-Id: I1fd3c97beefccc1cb4f0aed037c96a4bdaf78ff1 --- gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 modules = new ArrayList(); + 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()); } -- cgit v1.2.3