Repository: wicket Updated Branches: refs/heads/WICKET-5909 eced7b963 -> eb5b07b58
WICKET-5909 Simplify #getResourceStream(). It should do what #getCacheableResourceStream() does. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eb5b07b5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eb5b07b5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eb5b07b5 Branch: refs/heads/WICKET-5909 Commit: eb5b07b585753734cc989c72fce8a3f941bb538d Parents: eced7b9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri May 22 23:09:58 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri May 22 23:09:58 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/request/resource/PackageResource.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eb5b07b5/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java index 4bd50d4..c32feee 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java @@ -416,9 +416,7 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl */ public IResourceStream getResourceStream() { - String _style = style != null ? style : getCurrentStyle(); - Locale _locale = locale != null ? locale : getCurrentLocale(); - return internalGetResourceStream(_style, _locale); + return getCacheableResourceStream(); } /**
