svn commit: r1305638 - /myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java

[lu...@apache.org]

Author: lu4242
Date: Mon Mar 26 22:27:19 2012
New Revision: 1305638

URL: http://svn.apache.org/viewvc?rev=1305638&view=rev
Log:
small fix check for charset throw IllegalStateException as described on RenderKit.createResponseWriter

Modified:
    myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java

Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1305638&r1=1305637&r2=1305638&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Mon Mar 26 22:27:19 2012
@@ -20,6 +20,7 @@ package org.apache.myfaces.shared.render
 
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
@@ -178,6 +179,13 @@ public class HtmlResponseWriterImpl
         {
             // canonize to uppercase, that's the standard format
             _characterEncoding = characterEncoding.toUpperCase();
+            
+            // Check if encoding is valid by javadoc of RenderKit.createResponseWriter()
+            if (!Charset.isSupported(_characterEncoding))
+            {
+                throw new IllegalStateException("Encoding "+_characterEncoding
+                        +" not supported by HtmlResponseWriterImpl");
+            }
         }
         _isUTF8 = UTF8.equals(_characterEncoding);
     }