Author: pete
Date: Tue Nov 16 19:59:00 2010
New Revision: 1035768
URL: http://svn.apache.org/viewvc?rev=1035768&view=rev
Log:
WICKET-3167: replace java 1.6 method with 1.5 equivalent
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java?rev=1035768&r1=1035767&r2=1035768&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
Tue Nov 16 19:59:00 2010
@@ -111,7 +111,7 @@ public class ResourceUtil
if (charset == null)
charset = Charset.defaultCharset();
- return new String(bytes, charset);
+ return new String(bytes, charset.name());
}
finally
{
