Skip to content

Commit 9ad24bd

Browse files
authored
Merge pull request #3621 from adamretter/refactor/dup-code
Remove code which duplicates Commons IO
2 parents 3de9fe0 + 8fea167 commit 9ad24bd

File tree

2 files changed

+3
-57
lines changed

2 files changed

+3
-57
lines changed

extensions/webdav/src/main/java/org/exist/webdav/ByteCountOutputStream.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

extensions/webdav/src/main/java/org/exist/webdav/MiltonDocument.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.bradmcevoy.http.webdav.DefaultUserAgentHelper;
2727
import com.bradmcevoy.http.webdav.UserAgentHelper;
2828
import org.apache.commons.io.IOUtils;
29+
import org.apache.commons.io.output.CountingOutputStream;
30+
import org.apache.commons.io.output.NullOutputStream;
2931
import org.exist.EXistException;
3032
import org.exist.security.PermissionDeniedException;
3133
import org.exist.security.Subject;
@@ -248,7 +250,7 @@ public Long getContentLength() {
248250
}
249251

250252
// Stream document to '/dev/null' and count bytes
251-
try (final ByteCountOutputStream counter = new ByteCountOutputStream()) {
253+
try (final CountingOutputStream counter = new CountingOutputStream(NullOutputStream.NULL_OUTPUT_STREAM)) {
252254
existDocument.stream(counter);
253255
size = counter.getByteCount();
254256
} catch (Exception ex) {

0 commit comments

Comments
 (0)