You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/03/12 22:18:22 UTC
[15/34] wicket git commit: WICKET-5819 Use Streams helper class to
read the input into the output stream
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/75123abd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/75123abd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/75123abd
Branch: refs/heads/master
Commit: 75123abd04f3db036e45effff7a4d2c2b1346fe2
Parents: 4ce49ce
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 20 23:53:51 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 20 23:53:51 2015 +0200
----------------------------------------------------------------------
.../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/75123abd/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/75123abd/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)