diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-10-17 09:01:25 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-10-17 10:20:14 +0900 |
| commit | 98cdca9b5a830f1c2ceca52379d662a68109d43e (patch) | |
| tree | d843141173394b4ea4e435553885749096d4fb79 /org.eclipse.jgit.http.server/src/org/eclipse | |
| parent | 762f6212b4692b28f098ac597058bd6a489b8b49 (diff) | |
| download | jgit-98cdca9b5a830f1c2ceca52379d662a68109d43e.tar.gz jgit-98cdca9b5a830f1c2ceca52379d662a68109d43e.zip | |
Enable and fix "Statement unnecessarily nested within else clause" warnings
Since [1] the gerrit project includes jgit as a submodule, and has this
warning enabled, resulting in 100s of warnings in the console.
Also enable the warning here, and fix them.
At the same time, add missing braces around adjacent and nearby one-line
blocks.
[1] https://gerrit-review.googlesource.com/c/gerrit/+/227897
Change-Id: I81df3fc7ed6eedf6874ce1a3bedfa727a1897e4c
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.http.server/src/org/eclipse')
2 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java index f16749775f..574e94a892 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java @@ -86,10 +86,10 @@ abstract class ServletBinderImpl implements ServletBinder { * @return the configured servlet, or singleton returning 404 if none. */ protected HttpServlet getServlet() { - if (httpServlet != null) + if (httpServlet != null) { return httpServlet; - else - return new ErrorServlet(HttpServletResponse.SC_NOT_FOUND); + } + return new ErrorServlet(HttpServletResponse.SC_NOT_FOUND); } /** diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java index a69fab0afd..b9e6882556 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java @@ -83,8 +83,7 @@ public class DefaultUploadPackFactory implements up.setExtraParameters(Arrays.asList(params)); } return up; - } else { - throw new ServiceNotEnabledException(); } + throw new ServiceNotEnabledException(); } } |