WICKET-5819 Use Streams helper class to read the input into the output stream
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c742c353 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c742c353 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c742c353 Branch: refs/heads/pr-86-media_tags Commit: c742c353155c051d708678416a4a54b47f97e876 Parents: b53e750 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 20 23:53:51 2015 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Thu Mar 12 22:13:06 2015 +0100 ---------------------------------------------------------------------- .../markup/html/media/MediaStreamingResourceReference.java | 5 +++-- .../apache/wicket/markup/html/media/PartWriterCallback.java | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c742c353/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java index 94d60dc..bdaf5e6 100755 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java @@ -77,8 +77,6 @@ public class MediaStreamingResourceReference extends PackageResourceReference { throw new WicketRuntimeException("Cannot find resource: " + toString()); } - Long startbyte = null; - Long endbyte = null; try { Request request = attributes.getRequest(); @@ -106,6 +104,9 @@ public class MediaStreamingResourceReference extends PackageResourceReference // load and play content from a specific byte position webResponse.setHeader("Accept-Range", "bytes"); + Long startbyte = null; + Long endbyte = null; + // Calculating the response code and the byte range to be played String rangeHeader = webRequest.getHeader("range"); if (Strings.isEmpty(rangeHeader)) http://git-wip-us.apache.org/repos/asf/wicket/blob/c742c353/wicket-core/src/main/java/org/apache/wicket/markup/html/media/PartWriterCallback.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/PartWriterCallback.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/PartWriterCallback.java index b5467ff..23fa11f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/PartWriterCallback.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/PartWriterCallback.java @@ -24,6 +24,7 @@ import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.protocol.http.servlet.ResponseIOException; import org.apache.wicket.request.resource.AbstractResource.WriteCallback; import org.apache.wicket.request.resource.IResource.Attributes; +import org.apache.wicket.util.io.Streams; import org.apache.wicket.util.resource.IResourceStream; /** @@ -119,10 +120,7 @@ public class PartWriterCallback extends WriteCallback } else { - while (inputStream.read(buffer) != -1) - { - outputStream.write(buffer); - } + Streams.copy(inputStream, outputStream); } } catch (ResponseIOException e)
