svn commit: r668761 - /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java

[ivaynberg]

Author: ivaynberg
Date: Tue Jun 17 10:32:08 2008
New Revision: 668761

URL: http://svn.apache.org/viewvc?rev=668761&view=rev
Log:
WICKET-1704

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java?rev=668761&r1=668760&r2=668761&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
 Tue Jun 17 10:32:08 2008
@@ -16,6 +16,10 @@
  */
 package org.apache.wicket.util.resource;
 
+import java.io.UnsupportedEncodingException;
+
+import org.apache.wicket.WicketRuntimeException;
+
 
 /**
  * A StringResourceStream is an IResource implementation for strings.
@@ -87,7 +91,22 @@
        {
                // WICKET-1705: we cannot use string.length() because we need 
number of bytes rather then
                // number of characters
-               return string.toString().getBytes().length;
+               if (getCharset() != null)
+               {
+                       try
+                       {
+                               return 
getString().getBytes(getCharset().name()).length;
+                       }
+                       catch (UnsupportedEncodingException e)
+                       {
+                               throw new WicketRuntimeException(
+                                       "StringResourceStream created with 
unsupported charset: " + getCharset().name());
+                       }
+               }
+               else
+               {
+                       return getString().getBytes().length;
+               }
        }
 
 }