Changeset 21303 for main

Timestamp:

2009-12-09T13:07:34+13:00 (14 years ago)

Author:

xiao

Message:

close db connections and statements after they are used

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java

@@ -101 +101 @@
     //the database hasn't been correct yet
         ArrayList results = new ArrayList();
-    try{    
-        
-        if (statement == null){
+    ResultSet rs = null;
+    try{    
+        
+        if (statement == null){
             logger.info("the database hasn't been correct yet");
             return new ArrayList();
-        }
-    
-        ResultSet rs = statement.executeQuery(query_statement);
-        ResultSetMetaData rsmd = rs.getMetaData();
-        int numOfColumns = rsmd.getColumnCount();
-        while(rs.next()){
-           HashMap arow = new HashMap();
-           for(int i = 1; i <= numOfColumns ; i++){
-               arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i));
-           }
-           results.add(arow);  
-       }
+        }
+        
+        rs = statement.executeQuery(query_statement);
+        ResultSetMetaData rsmd = rs.getMetaData();
+        int numOfColumns = rsmd.getColumnCount();
+        while(rs.next()){
+        HashMap arow = new HashMap();
+        for(int i = 1; i <= numOfColumns ; i++){
+            arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i));
+        }
+        results.add(arow);  
+        }
+
+        rs.close();
+       
     }
     catch(SQLException sqle){
@@ -124 +128 @@
     }
     catch(Exception e){         
-        logger.debug(e);
-        return null;
+        logger.debug(e);
+        return null;
     }
     return results;
@@ -143 +147 @@
             logger.debug(stat);
             rs = statement.executeQuery(stat);
-            
-            logger.info("sql stat="+stat+ " result="+rs);
+            logger.info("sql stat="+stat+ " result="+rs);
         }
         catch(SQLException sqle){
@@ -169 +172 @@
 
             rs = statement.execute(stat);
-//          connection.commit();
+        statement.close();
+        //          connection.commit();
         }
         catch(SQLException sqle){           
@@ -194 +198 @@
             //either the row count of INSERT, UPDATE OR DELETE statement, or 0 if the statement returns nothing
             rs = statement.executeUpdate(stat);
+        statement.close();
 //          connection.commit();
-            logger.debug("sql stat="+stat+ " result="+rs);
+        logger.debug("sql stat="+stat+ " result="+rs);
         }
         catch(SQLException sqle){           
@@ -214 +219 @@
     public void check4Table(String stat) throws SQLException {
         statement.executeQuery(stat);
+    statement.close();
     }
 
     public void closeConnection(String databasepath){
-    sqlServer.disconnect(databasepath);
+    try{
+        statement.close();
+        connection.close();
+        sqlServer.disconnect(databasepath);
+    }
+    catch(SQLException sqle){
+        logger.debug("Database Error occured when close connection " + databasepath, sqle);
+    }
     }