You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ts...@apache.org on 2015/10/08 04:37:17 UTC
wicket git commit: WICKET-5995
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 9ce82fd2f -> 51c713d62
WICKET-5995
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51c713d6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51c713d6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51c713d6
Branch: refs/heads/wicket-7.x
Commit: 51c713d6210d07602afe203f45f1b42c72c7c135
Parents: 9ce82fd
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Thu Oct 8 04:36:09 2015 +0200
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Thu Oct 8 04:36:09 2015 +0200
----------------------------------------------------------------------
.../org/apache/wicket/request/resource/AbstractResource.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/51c713d6/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
index 0d41238..50ef087 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
@@ -46,6 +46,7 @@ import org.apache.wicket.util.time.Time;
* {@link #newResourceResponse(org.apache.wicket.request.resource.IResource.Attributes)} method.
*
* @author Matej Knopp
+ * @author Tobias Soloschenko
*/
public abstract class AbstractResource implements IResource
{
@@ -731,8 +732,12 @@ public abstract class AbstractResource implements IResource
String range = rangeHeader.substring(rangeHeader.indexOf('=') + 1,
rangeHeader.length());
+
+ // Due to WICKET-5995 it is required to check if several ranges are specified
+ // because of streams in java only the first given range can be used to read them.
+ String firstRange = range.contains(",") ? range.substring(0, range.indexOf(',')) : range;
- String[] rangeParts = Strings.split(range, '-');
+ String[] rangeParts = Strings.split(firstRange, '-');
String startByteString = rangeParts[0];
String endByteString = rangeParts[1];