fix bug where Mir.DefaultEncoding (the java one) was being sent out in the response...

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index da49b75..66896c0 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -61,6 +61,8 @@ public class OpenMir extends AbstractServlet {
   private static String lang;
   public HttpSession session;
 
+  private boolean nameSet = false;
+
   public void doGet(HttpServletRequest req, HttpServletResponse res)
     throws ServletException, IOException {
     doPost(req,res);
@@ -77,14 +79,22 @@ public class OpenMir extends AbstractServlet {
     if(getServletContext().getAttribute("mir.confed") == null) {
       getConfig(req);
     }
+    if (!nameSet) {
+        MirConfig.setOpenServletName(getServletName());
+        nameSet = true;
+    }
+      
     session = req.getSession();
 
     if(session.getAttribute("Language")==null){
       setLanguage(session,getAcceptLanguage(req));
     }
 
+    //make sure client browsers don't cache anything
+    setNoCaching(res);
+
     res.setContentType("text/html; charset="
-                      +MirConfig.getProp("Mir.DefaultEncoding"));
+                      +MirConfig.getProp("Mir.DefaultHTMLCharset"));
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }