From bc9a54d1906761b8baa18388889616fea69c9162 Mon Sep 17 00:00:00 2001
From: jfarcand <jfarcand@apache.org>
Date: Mon, 25 Mar 2013 15:05:04 -0400
Subject: [PATCH] Fix for #981

---
 .../java/org/atmosphere/util/ServletProxyFactory.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/cpr/src/main/java/org/atmosphere/util/ServletProxyFactory.java b/modules/cpr/src/main/java/org/atmosphere/util/ServletProxyFactory.java
index 1eadfad6024..a4ddc3e077f 100644
--- a/modules/cpr/src/main/java/org/atmosphere/util/ServletProxyFactory.java
+++ b/modules/cpr/src/main/java/org/atmosphere/util/ServletProxyFactory.java
@@ -34,7 +34,9 @@ public class ServletProxyFactory {
     private final static MethodHandler voidMethodHandler = new EchoMethodHandler();
 
     private ServletProxyFactory() {
-        addMethodHandler("encodeURL", voidMethodHandler).addMethodHandler("encodeRedirectURL", voidMethodHandler);
+        addMethodHandler("encodeURL", voidMethodHandler)
+                .addMethodHandler("encodeRedirectURL", voidMethodHandler)
+                .addMethodHandler("getCharacterEncoding", new UTF8Handler());
     }
 
     public final Object proxy(Object clazz, Method method, Object[] methodObjects) {
@@ -79,6 +81,13 @@ public Object handle(Object clazz, Method method, Object[] methodObjects) {
             return methodObjects[0];
         }
     }
+
+    public static class UTF8Handler implements MethodHandler{
+        @Override
+        public Object handle(Object clazz, Method method, Object[] methodObjects) {
+            return "UTF-8";
+        }
+    }
 }