X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fservlet%2FAbstractServlet.java;h=ff059d5d836906934b3d1105ea8f3aa90add63e2;hb=aa507bfd18e723d21e63454a26af3320bb8c27f2;hp=e343842ec874eeb8aabaaaf0fcbfab10cea964b7;hpb=1660e5268c5eba7a3fae476d62fa3af4ce8e23f6;p=mir.git

diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java
index e343842e..ff059d5d 100755
--- a/source/mir/servlet/AbstractServlet.java
+++ b/source/mir/servlet/AbstractServlet.java
@@ -32,8 +32,8 @@ package mir.servlet;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.sql.Connection;
 import java.util.Locale;
-import java.sql.*;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -42,23 +42,21 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
+import mircoders.global.MirGlobal;
 
-import com.codestudio.util.*;
+import com.codestudio.util.JDBCPool;
 import com.codestudio.util.JDBCPoolMetaData;
 import com.codestudio.util.SQLManager;
 
-import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
-import mir.log.LoggerWrapper;
-import mircoders.global.*;
-
 /**
  * Title:        Mir
  * Description:  Abstract servlet-class
  * Copyright:    Copyright (c) 2001, 2002
  * Company:      Mir-coders group
  * @author       idfx, the Mir-coders group
- * @version      $Id: AbstractServlet.java,v 1.30.2.3 2003/06/28 04:04:25 zapata Exp $
+ * @version      $Id: AbstractServlet.java,v 1.30.2.5 2003/10/23 14:55:26 rk Exp $
  */
 
 public abstract class AbstractServlet extends HttpServlet {
@@ -197,7 +195,7 @@ public abstract class AbstractServlet extends HttpServlet {
     Connection connection;
     try {
       connection = pool.requestConnection();
-      pool.closeConnection(connection);
+	  JDBCPool.closeConnection(connection);
     }
     catch (Throwable t) {
       logger.fatal("Can't connect to database: " + t.toString());
@@ -207,23 +205,31 @@ public abstract class AbstractServlet extends HttpServlet {
 
   private void setEncoding(HttpServletRequest request){
     try {
+      logger.info("Request has encoding: " + request.getCharacterEncoding());
+      logger.info("Config stipulates encoding: " + configuration.getString("Mir.DefaultHTMLCharset"));
       Class reqClass = request.getClass();
       Method method = reqClass.getMethod("setCharacterEncoding", new Class[]{String.class});
       String encoding = configuration.getString("Mir.DefaultHTMLCharset");
       method.invoke(request, new Object[]{encoding});
-    } catch (NoSuchMethodException e) {
+      logger.info("Request now has encoding: " + request.getCharacterEncoding());
+    }
+    catch (NoSuchMethodException e) {
       // TODO set the encoding in a zapata-way
 //      logger.warn("set encoding not yet implemented: " + e.getMessage());
-    } catch (SecurityException e) {
+    }
+    catch (SecurityException e) {
       logger.error(e.getMessage());
       e.printStackTrace();
-    } catch (IllegalArgumentException e) {
+    }
+    catch (IllegalArgumentException e) {
       logger.error(e.getMessage());
       e.printStackTrace();
-    } catch (IllegalAccessException e) {
+    }
+    catch (IllegalAccessException e) {
       logger.error(e.getMessage());
       e.printStackTrace();
-    } catch (InvocationTargetException e) {
+    }
+    catch (InvocationTargetException e) {
       logger.error(e.getMessage());
       e.printStackTrace();
     }