diff --git a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java index cc7758d7a9..6787a213f5 100644 --- a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java +++ b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java @@ -307,5 +307,5 @@ public class ProxyServlet extends HttpServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private ProxyConfigurationProvider configurationProvider; + private final ProxyConfigurationProvider configurationProvider; } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java index dbdd12809a..686e4dfbd7 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java @@ -54,6 +54,7 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import sonia.scm.repository.RepositoryException; /** * @@ -170,7 +171,11 @@ public class ScmGitServlet extends GitServlet { repositoryViewer.handleRequest(request, response, scmRepository); } - catch (Exception ex) + catch (RepositoryException ex) + { + throw new ServletException("could not create repository view", ex); + } + catch (IOException ex) { throw new ServletException("could not create repository view", ex); } @@ -184,11 +189,11 @@ public class ScmGitServlet extends GitServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private RepositoryProvider repositoryProvider; + private final RepositoryProvider repositoryProvider; /** Field description */ - private RepositoryRequestListenerUtil repositoryRequestListenerUtil; + private final RepositoryRequestListenerUtil repositoryRequestListenerUtil; /** Field description */ - private GitRepositoryViewer repositoryViewer; + private final GitRepositoryViewer repositoryViewer; } diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java index a9346b3027..410d20847a 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java @@ -122,6 +122,7 @@ public class HgCGIServlet extends HttpServlet this.hookManager = hookManager; this.requestListenerUtil = requestListenerUtil; this.exceptionHandler = new HgCGIExceptionHandler(); + this.command = HgPythonScript.HGWEB.getFile(SCMContext.getContext()); } //~--- methods -------------------------------------------------------------- @@ -135,7 +136,7 @@ public class HgCGIServlet extends HttpServlet @Override public void init() throws ServletException { - command = HgPythonScript.HGWEB.getFile(SCMContext.getContext()); + super.init(); } @@ -176,7 +177,11 @@ public class HgCGIServlet extends HttpServlet { handleRequest(request, response, repository); } - catch (Exception ex) + catch (ServletException ex) + { + exceptionHandler.handleException(request, response, ex); + } + catch (IOException ex) { exceptionHandler.handleException(request, response, ex); } @@ -258,6 +263,7 @@ public class HgCGIServlet extends HttpServlet executor.getEnvironment().set(ENV_REPOSITORY_NAME, name); executor.getEnvironment().set(ENV_REPOSITORY_PATH, directory.getAbsolutePath()); + // add hook environment //J- HgEnvironment.prepareEnvironment( @@ -312,26 +318,26 @@ public class HgCGIServlet extends HttpServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private CGIExecutorFactory cgiExecutorFactory; + private final CGIExecutorFactory cgiExecutorFactory; /** Field description */ - private File command; + private final File command; /** Field description */ - private ScmConfiguration configuration; + private final ScmConfiguration configuration; /** Field description */ - private HgCGIExceptionHandler exceptionHandler; + private final HgCGIExceptionHandler exceptionHandler; /** Field description */ - private HgRepositoryHandler handler; + private final HgRepositoryHandler handler; /** Field description */ - private HgHookManager hookManager; + private final HgHookManager hookManager; /** Field description */ - private RepositoryProvider repositoryProvider; + private final RepositoryProvider repositoryProvider; /** Field description */ - private RepositoryRequestListenerUtil requestListenerUtil; + private final RepositoryRequestListenerUtil requestListenerUtil; } diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java index ff4c9863c0..da24e94a16 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java @@ -538,14 +538,14 @@ public class HgHookCallbackServlet extends HttpServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private Provider contextProvider; + private final Provider contextProvider; /** Field description */ - private HgRepositoryHandler handler; + private final HgRepositoryHandler handler; /** Field description */ - private HookEventFacade hookEventFacade; + private final HookEventFacade hookEventFacade; /** Field description */ - private HgHookManager hookManager; + private final HgHookManager hookManager; } diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.java index 701de1d44b..db22857595 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.java @@ -284,21 +284,21 @@ public class SvnDAVServlet extends DAVServlet //~--- fields ------------------------------------------------------------- /** Field description */ - private RepositoryProvider repositoryProvider; + private final RepositoryProvider repositoryProvider; } //~--- fields --------------------------------------------------------------- /** Field description */ - private SvnCollectionRenderer collectionRenderer; + private final SvnCollectionRenderer collectionRenderer; /** Field description */ - private SvnRepositoryHandler handler; + private final SvnRepositoryHandler handler; /** Field description */ - private RepositoryProvider repositoryProvider; + private final RepositoryProvider repositoryProvider; /** Field description */ - private RepositoryRequestListenerUtil repositoryRequestListenerUtil; + private final RepositoryRequestListenerUtil repositoryRequestListenerUtil; } diff --git a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceServlet.java index a495456596..2488ba8d3f 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceServlet.java @@ -167,5 +167,5 @@ public abstract class AbstractResourceServlet extends HttpServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private ResourceManager resourceManager; + private final ResourceManager resourceManager; } diff --git a/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java b/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java index 7cfd6342ab..9672aea67b 100644 --- a/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java @@ -185,8 +185,8 @@ public class ErrorServlet extends HttpServlet //~--- fields --------------------------------------------------------------- /** Field description */ - private SCMContextProvider context; + private final SCMContextProvider context; /** Field description */ - private TemplateEngineFactory templateEngineFactory; + private final TemplateEngineFactory templateEngineFactory; }