opendev/gerrit
Code Issues Proposed changes

LfsPluginServlet#service: Remove unreachable block

Browse Source 
The call to chain.doFilter will not be reached; if filter is null the
method returns early, and if not null the previous branch of the if-
block is entered.

Also move the initialization of chain into the constructor so it's only
done once.

Change-Id: I285242bdfcaebc1f9df72d0d3943b7e1b22da80a
This commit is contained in:
David Pursehouse
2016-07-11 10:55:38 +09:00
parent 1f6ee51521
commit 53eab0a4f5
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java
View File

@@ -57,11 +57,20 @@ public class LfsPluginServlet extends HttpServlet
private List<Plugin> pending = new ArrayList<>();
private final String pluginName;
private final FilterChain chain;
private GuiceFilter filter;
@Inject
LfsPluginServlet(@GerritServerConfig Config cfg) {
this.pluginName = cfg.getString("lfs", null, "plugin");
this.chain = new FilterChain() {
@Override
public void doFilter(ServletRequest req, ServletResponse res)
throws IOException {
Resource.NOT_FOUND.send(
(HttpServletRequest) req, (HttpServletResponse) res);
}
};
}
@Override
@@ -72,19 +81,7 @@ public class LfsPluginServlet extends HttpServlet
res.sendError(SC_NOT_IMPLEMENTED);
return;
}
FilterChain chain = new FilterChain() {
@Override
public void doFilter(ServletRequest req, ServletResponse res)
throws IOException {
Resource.NOT_FOUND.send((HttpServletRequest) req, (HttpServletResponse) res);
}
};
if (filter != null) {
filter.doFilter(req, res, chain);
} else {
chain.doFilter(req, res);
}
filter.doFilter(req, res, chain);
}
@Override