Changeset 9847 for branches/ant-install-branch/gsdl3

Timestamp:

2005-05-10T15:48:11+12:00 (19 years ago)

Author:

kjdon

Message:

do a lot more tidying up. close the previous statement before creating a new one - if you don't close a statement it doesn't free up its memory resources. also remember the database now so we can clone the connection - need to create a new connection if we want to execute something while we are still using results from a previous execution - when a statement is closed, so is its resultset

Location:

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database

Files:

• GS3SQLConnection.java (modified) (4 diffs)
• GS3SQLConnectionFactory.java (modified) (2 diffs)
• SQLConnection.java (modified) (6 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnection.java

@@ -14 +14 @@
 {
 
-    public GS3SQLConnection(java.sql.Connection connection)
+    public GS3SQLConnection(java.sql.Connection connection, String database)
     { 
-    super(connection);
+    super(connection, database);
     }
     
@@ -25 +25 @@
   }
     
-
+    public GS3SQLConnection cloneConnection() {
+    GS3SQLConnection conn = GS3SQLConnectionFactory.getGS3SQLConnection(this.database);
+    return conn;
+    }
   /**
    *  Initialise a collection for use.
@@ -224 +227 @@
       statement.execute(classData.toString());
 
+      statement.close();
       //
       // END OF GSDL TABLES
@@ -232 +236 @@
     {
       System.out.println(ex.toString());
+      if (statement != null) {
+      try {
+          statement.close();
+      } catch (Exception e){}
+      statement = null;
+      }
       return false;
     }

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnectionFactory.java

@@ -32 +32 @@
         return null;
     }
-    return new SQLConnection(c);
+    return new SQLConnection(c, database);
     }
 
@@ -42 +42 @@
         return null;
     }
-    return new GS3SQLConnection(c);
+    return new GS3SQLConnection(c, database);
     }
 

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/SQLConnection.java

@@ -11 +11 @@
     protected Connection connection;
     protected Statement  statement;
-
-
-    public SQLConnection(java.sql.Connection connection)
+    protected String database;
+    
+    public SQLConnection(java.sql.Connection connection, String database)
     { 
     this.connection = connection;
+    this.database = database;
     }
     
@@ -21 +22 @@
     if (this.connection!=null) {
         try {
-        this.connection.close();
+        this.connection.close();        
         } catch (Exception e) {}
-        
-        this.connection = null;
     }
+    if (this.statement!=null) {
+        try {
+        this.statement.close();     
+        } catch (Exception e) {}
+    }
+    
+    this.connection = null;   
+    this.statement = null;
+
     }
     
+    public void close() {
+    finalize();
+    }
+    
     public boolean execute(String sql)
     {
     try {
+        if (this.statement != null) {
+        this.statement.close();
+        }
         this.statement = this.connection.createStatement();
         this.statement.execute(sql);
@@ -41 +56 @@
     }
     
+    public void closeStatement() {
+    try {
+        if (this.statement != null) {
+        this.statement.close();
+        } 
+    } catch (Exception e) {}
+        
+    }
     public Statement createStatement()
     { 
@@ -67 +90 @@
     
     public boolean connectToDatabase(String database) {
+    if (this.connection != null) {
+        try {
+        this.connection.close();
+        } catch (Exception e) {}
+    }
     this.connection = GS3SQLConnectionFactory.getConnection(database);
     if (this.connection == null) {
         return false;
     }
+    this.database = database;
     return true;
     }
@@ -78 +107 @@
         this.statement = this.connection.createStatement();
         this.statement.execute("DROP DATABASE "+database+";");
+        this.statement.close();
     }
     catch (SQLException ex){
@@ -92 +122 @@
         this.statement = this.connection.createStatement();
         this.statement.execute(command);
+        this.statement.close();
     } catch (Exception e) {
         System.err.println(e);