You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2013/02/13 21:25:02 UTC

[2/2] git commit: ISIS-275: Applied patch

Updated Branches:
  refs/heads/master 8c63f8238 -> 7ba9e17ae


ISIS-275: Applied patch


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7ba9e17a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7ba9e17a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7ba9e17a

Branch: refs/heads/master
Commit: 7ba9e17ae7fcd95ed60c6ecf00c878a4705cce50
Parents: 5ee893a
Author: Kevin Meyer <ke...@apache.org>
Authored: Wed Feb 13 21:22:41 2013 +0100
Committer: Kevin Meyer <ke...@apache.org>
Committed: Wed Feb 13 21:22:41 2013 +0100

----------------------------------------------------------------------
 .../viewer/html/servlet/ControllerServlet.java     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/7ba9e17a/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
----------------------------------------------------------------------
diff --git a/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java b/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
index bc6f441..3c84343 100644
--- a/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
+++ b/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
@@ -122,7 +122,7 @@ public class ControllerServlet extends AbstractHtmlViewerServlet {
     private void processRequest(final HttpServletRequest request, final HttpServletResponse response,
         final Request req, final Context context) throws IOException, ServletException {
         response.setContentType("text/html");
-
+        response.setCharacterEncoding(encoding);
         // no need to check if logged in; the IsisSessionFilter would
         // have prevented us from getting here.