Updated Branches: refs/heads/wicket-1.5.x 4e0ccaca1 -> 2328ad828
WICKET-5351 ResourceStreamResource should use the locale rs, not the member field Same problem as WICKET-4632, but in the 1.5.x branch (4632 was only fixed in 6.x) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2328ad82 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2328ad82 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2328ad82 Branch: refs/heads/wicket-1.5.x Commit: 2328ad8282719a23912d4cb4378a5038027748ae Parents: 4e0ccac Author: Jeremy Thomerson <[email protected]> Authored: Fri Sep 13 23:49:02 2013 -0400 Committer: Jeremy Thomerson <[email protected]> Committed: Sat Sep 14 00:31:18 2013 -0400 ---------------------------------------------------------------------- .../org/apache/wicket/request/resource/ResourceStreamResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2328ad82/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java index 115ae5d..bd7bd4d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java @@ -144,7 +144,7 @@ public class ResourceStreamResource extends AbstractResource if (data.dataNeedsToBeWritten(attributes)) { InputStream inputStream = null; - if (stream instanceof IResourceStreamWriter == false) + if (resourceStream instanceof IResourceStreamWriter == false) { try {
