Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

do not expose IOException

Browse Source
This commit is contained in:
Sebastian Sdorra
2018-08-30 11:03:15 +02:00
parent 5a22255a2b
commit f8df92ef7a
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java
View File

@@ -47,7 +47,7 @@ public class WebResourceServlet extends HttpServlet {
} }
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { protected void doGet(HttpServletRequest request, HttpServletResponse response) {
String uri = normalizeUri(request); String uri = normalizeUri(request);
LOG.trace("try to load {}", uri); LOG.trace("try to load {}", uri);
@@ -55,7 +55,16 @@ public class WebResourceServlet extends HttpServlet {
if (url != null) { if (url != null) {
serveResource(response, url); serveResource(response, url);
} else { } else {
dispatch(request, response, uri);
}
}
private void dispatch(HttpServletRequest request, HttpServletResponse response, String uri) {
try {
pushStateDispatcher.dispatch(request, response, uri); pushStateDispatcher.dispatch(request, response, uri);
} catch (IOException ex) {
LOG.error("failed to dispatch: " + uri, ex);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} }
} }

8
scm-webapp/src/test/java/sonia/scm/WebResourceServletTest.java
View File

@@ -105,6 +105,14 @@ public class WebResourceServletTest {
verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} }
@Test
public void testDoGetWithDispatcherException() throws IOException {
when(request.getRequestURI()).thenReturn("/scm/awesome.jpg");
doThrow(IOException.class).when(pushStateDispatcher).dispatch(request, response, "/awesome.jpg");
servlet.doGet(request, response);
verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
private static class TestingOutputServletOutputStream extends ServletOutputStream { private static class TestingOutputServletOutputStream extends ServletOutputStream {
private ByteArrayOutputStream buffer = new ByteArrayOutputStream(); private ByteArrayOutputStream buffer = new ByteArrayOutputStream();