Skip to content
This repository was archived by the owner on Jul 21, 2024. It is now read-only.

Commit db97b2c

Browse files
committed
* 屏蔽下载过程中无意义出错输出
1 parent 0eb9ebf commit db97b2c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/com/github/zxbu/webdavteambition/filter/ErrorFilter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ private static String readErrorPage() {
3434
@Override
3535
protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
3636
ErrorWrapperResponse wrapperResponse = new ErrorWrapperResponse(httpServletResponse);
37-
3837
try {
3938
filterChain.doFilter(httpServletRequest, wrapperResponse);
4039
if (wrapperResponse.hasErrorToSend()) {
@@ -50,13 +49,13 @@ protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServl
5049
message = WebdavStatus.getStatusText(status);
5150
}
5251
String errorXml = errorPage.replace("{{code}}", status + "").replace("{{message}}", message);
53-
httpServletResponse.getWriter().write(errorXml);
52+
httpServletResponse.getOutputStream().write(errorXml.getBytes(StandardCharsets.UTF_8));
5453
}
5554
httpServletResponse.flushBuffer();
5655
} catch (Throwable t) {
5756
try {
5857
httpServletResponse.setStatus(500);
59-
httpServletResponse.getWriter().write(t.getMessage());
58+
httpServletResponse.getOutputStream().write(t.getMessage().getBytes(StandardCharsets.UTF_8));
6059
httpServletResponse.flushBuffer();
6160
} catch (IOException e) {
6261
}

src/main/java/net/sf/webdav/methods/DoGet.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ protected void doBody(ITransaction transaction, HttpServletResponse resp,
7979
} catch (EOFException ignore) {
8080
} catch (Exception e) {
8181
String message = e.getMessage();
82-
if (!message.contains("Connection reset by peer")) {
82+
if (!message.contains("Connection reset by peer")
83+
&& !message.contains("Broken pipe")
84+
&& !e.getClass().getName().contains(".ClientAbortException")) {
8385
LOG.warn("{} doBody causes Exception!\n", path,e);
8486
LOG.trace(e.toString());
8587
}

0 commit comments

Comments
 (0)