You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/07/08 15:40:38 UTC
wicket git commit: WICKET-5946 JavaScript/Css PackageResource should
use the same charset for compressing
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 954c9e1e1 -> 42fa46e11
WICKET-5946 JavaScript/Css PackageResource should use the same charset for compressing
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/42fa46e1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/42fa46e1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/42fa46e1
Branch: refs/heads/wicket-6.x
Commit: 42fa46e1134a60d4c8d584f46b141ba8b8236592
Parents: 954c9e1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 8 16:37:46 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jul 8 16:40:31 2015 +0300
----------------------------------------------------------------------
.../org/apache/wicket/request/resource/CssPackageResource.java | 5 +++--
.../wicket/request/resource/JavaScriptPackageResource.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/42fa46e1/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
index bbc1826..df4a12d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
@@ -66,7 +66,8 @@ public class CssPackageResource extends PackageResource
{
try
{
- String nonCompressed = new String(processedResponse, "UTF-8");
+ String charsetName = "UTF-8";
+ String nonCompressed = new String(processedResponse, charsetName);
String output;
if (compressor instanceof IScopeAwareTextResourceProcessor)
{
@@ -77,7 +78,7 @@ public class CssPackageResource extends PackageResource
{
output = compressor.compress(nonCompressed);
}
- return output.getBytes();
+ return output.getBytes(charsetName);
}
catch (Exception e)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/42fa46e1/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
index 49f393a..b2577ab 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
@@ -60,7 +60,8 @@ public class JavaScriptPackageResource extends PackageResource
{
try
{
- String nonCompressed = new String(processedResponse, "UTF-8");
+ String charsetName = "UTF-8";
+ String nonCompressed = new String(processedResponse, charsetName);
String output;
if (compressor instanceof IScopeAwareTextResourceProcessor)
{
@@ -71,7 +72,7 @@ public class JavaScriptPackageResource extends PackageResource
{
output = compressor.compress(nonCompressed);
}
- return output.getBytes();
+ return output.getBytes(charsetName);
}
catch (Exception e)
{