Changeset 16652

Timestamp:

2008-08-05 14:36:54 (4 months ago)

Author:

shaoqun

Message:

remove the caching of DBWrapper

Files:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java (modified) (4 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java

@@ -12 +12 @@
-public class DatabaseFactory{
-    private static HashMap serverMap = new HashMap();
-    private static HashMap wrapperMap = new HashMap();
-    private static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.DatabaseFactory.class.getName());
-
@@ -67 +66 @@
-    public static final MetadataDBWrapper getMetadataDBWrapper(String dbname, String sqlstate){
-        dbname = properDBName(dbname);
-        if (wrapperMap.containsKey(dbname + ":" + sqlstate)) return (MetadataDBWrapper)wrapperMap.get(dbname + ":" + sqlstate); 
-
-        String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"DBWrapper";
@@ -85 +83 @@
-                   if (state != null){
-                       wrapper.setSQLStatements(state); 
-                       wrapperMap.put(dbname + ":" + sqlstate, wrapper);
-                       return wrapper;
-                   }
@@ -95 +92 @@
-                        if (state != null){
-                            wrapper.setSQLStatements(state);
-                            wrapperMap.put(dbname + ":" + sqlstate,wrapper);
-                            return wrapper;
-                        }