dbpoolman instead of connectionbroker

[mir.git] / source / mir / storage / Database.java

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 893aa92..ec48710 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -12,6 +12,9 @@ import  com.javaexchange.dbConnectionBroker.*;
 import  mir.storage.StorageObject;
 import  mir.entity.*;
 import  mir.misc.*;
+import com.codestudio.sql.*;
+import com.codestudio.sql.*;
+import com.codestudio.util.*;
 
 
 /**
@@ -37,7 +40,7 @@ public class Database implements StorageObject {
   protected int[]                     metadataTypes;
   protected Class                     theEntityClass;
   protected StorageObject             myselfDatabase;
-  protected HashMap                   cache;
+  protected DatabaseCache             cache;
   protected SimpleList                popupCache=null;
   protected boolean                   hasPopupCache = false;
   protected SimpleHash                hashCache=null;
@@ -72,7 +75,7 @@ public class Database implements StorageObject {
       database_url=theAdaptor.getURL(database_username,database_password,database_host);
       theLog.printDebugInfo("adding Broker with: " +database_driver+":"+database_url  );
       MirConfig.addBroker(database_driver,database_url);
-      myBroker=MirConfig.getBroker();
+      //myBroker=MirConfig.getBroker();
     }
     catch (Exception e){
       theLog.printError("Bei Konstruktion von Database() with " + theAdaptorName + " -- " +e.toString());
@@ -216,13 +219,13 @@ public class Database implements StorageObject {
             break;
           case java.sql.Types.CHAR:case java.sql.Types.VARCHAR:case java.sql.Types.LONGVARCHAR:
             outValue = rs.getString(valueIndex);
-            if (outValue != null)
-              outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
+            //if (outValue != null)
+              //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
             break;
           case java.sql.Types.LONGVARBINARY:
             outValue = rs.getString(valueIndex);
-            if (outValue != null)
-              outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
+            //if (outValue != null)
+              //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
             break;
           case java.sql.Types.TIMESTAMP:
             Timestamp timestamp = (rs.getTimestamp(valueIndex));
@@ -253,7 +256,7 @@ public class Database implements StorageObject {
 
     if (id==null||id.equals(""))
       throw new StorageObjectException("id war null");
-    if (cache != null && cache.containsKey(id))
+    if (cache != null && (cache.containsKey(id) > -1))
       return (Entity)cache.get(id);  // wenn cache gesetzt, evtl. kein roundtrip zur Datenbank
 
     Statement stmt=null;Connection con=getPooledCon();
@@ -433,10 +436,16 @@ public class Database implements StorageObject {
           if (rs.next())
             count = rs.getInt(1);
           rs.close();
+          //nothing in the table: return null
+          if(count<=0){
+            freeConnection(con, stmt);
+            return null;
+          }
+        } else {
+          theLog.printError("Could not count: " + countSql);
         }
-        else
-          theLog.printError("Mh. Konnte nicht zaehlen: " + countSql);
       }
+
       // hier select
       rs = executeSql(stmt, selectSql.toString());
       if (rs != null) {
@@ -516,11 +525,10 @@ public class Database implements StorageObject {
           theResultHash.put(metadataFields.get(i), theResult);
         }
       }
-      if (cache != null && theResultHash.containsKey(thePKeyName) && cache.containsKey((String)theResultHash.get(thePKeyName))) {
-        //theLog.printDebugInfo("CACHE: (out) "+ theResultHash.get(thePKeyName)+ " :"+theTable);
+      if (cache != null && theResultHash.containsKey(thePKeyName) &&
+          (cache.containsKey((String)theResultHash.get(thePKeyName)) > -1)) {
         returnEntity = (Entity)cache.get((String)theResultHash.get(thePKeyName));
-      }
-      else {
+      } else {
         if (theEntityClass != null) {
           returnEntity = (Entity)theEntityClass.newInstance();
           returnEntity.setValues(theResultHash);
@@ -529,13 +537,11 @@ public class Database implements StorageObject {
             //theLog.printDebugInfo("CACHE: ( in) " + returnEntity.getId() + " :"+theTable);
             cache.put(returnEntity.getId(), returnEntity);
           }
-        }
-        else {
+        } else {
           throwStorageObjectException("Interner Fehler theEntityClass nicht gesetzt!");
         }
       }
-    }           // try
-    catch (IllegalAccessException e) {
+    } catch (IllegalAccessException e) {
       throwStorageObjectException("Kein Zugriff! -- " + e.toString());
     } catch (IOException e) {
       throwStorageObjectException("IOException! -- " + e.toString());
@@ -1040,13 +1046,30 @@ public class Database implements StorageObject {
       throwSQLException(sqe, "disconnectPool");
     }
   }
+  
+  public Connection getPooledCon() throws StorageObjectException {
+    try{
+      Class.forName("com.codestudio.sql.PoolMan").newInstance();
+    } catch (Exception e){
+      e.printStackTrace();
+      throw new StorageObjectException("Could not find the PoolMan Driver"+e.toString());
+    }
+    Connection con = null;
+    try{
+      con = SQLManager.getInstance().requestConnection();
+    } catch(SQLException e){
+      e.printStackTrace();
+      throw new StorageObjectException("No connection to the database");
+    }
+    return con;
+  }
 
   /**
    * Returns Connection-Object out of the PoolBroker.
    *
    * @return Connection Object.
    */
-  public Connection getPooledCon () throws StorageObjectException {
+  public Connection getPooledCon2() throws StorageObjectException {
     if (myBroker != null) {
       Connection con = myBroker.getConnection();
       if (con != null)
@@ -1061,7 +1084,7 @@ public class Database implements StorageObject {
    * @param con Connection zur Datenbank
    * @param stmt Statement-Objekt
    */
-  public void freeConnection (Connection con, Statement stmt)
+  public void freeConnection2 (Connection con, Statement stmt)
     throws StorageObjectException {
     try {
       if (stmt != null)
@@ -1077,6 +1100,12 @@ public class Database implements StorageObject {
       throw new StorageObjectException("Con was null!");
     }
   }
+  
+  public void freeConnection (Connection con, Statement stmt)
+    throws StorageObjectException {
+    SQLManager.getInstance().closeStatement(stmt);
+    SQLManager.getInstance().returnConnection(con);
+  }
 
   /**
    * Wertet SQLException aus und wirft dannach eine StorageObjectException
@@ -1118,6 +1147,7 @@ public class Database implements StorageObject {
   void throwStorageObjectException (String message) throws StorageObjectException {
     _throwStorageObjectException(null, message);
   }
+
 }