Repository: cxf Updated Branches: refs/heads/master fcc8bcb38 -> 9eb8c6028
[CXF-6278] Updating InputStream provider to support MessageDigestInputStream Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9eb8c602 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9eb8c602 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9eb8c602 Branch: refs/heads/master Commit: 9eb8c60288934875ef0dfd2cf78d128724b95106 Parents: fcc8bcb Author: Sergey Beryozkin <[email protected]> Authored: Thu Mar 12 11:28:57 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Mar 12 11:28:57 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9eb8c602/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java index 8ba39c4..b0cd13a 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java @@ -33,6 +33,7 @@ import java.io.Reader; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.security.DigestInputStream; import java.util.UUID; import java.util.logging.Logger; @@ -44,6 +45,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.common.util.MessageDigestInputStream; import org.apache.cxf.helpers.FileUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.impl.HttpHeadersImpl; @@ -84,6 +86,9 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider throws IOException { try { if (InputStream.class.isAssignableFrom(clazz)) { + if (DigestInputStream.class.isAssignableFrom(clazz)) { + is = new MessageDigestInputStream(is); + } return clazz.cast(is); } if (Reader.class.isAssignableFrom(clazz)) {
