Changeset 9858 for branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java

Timestamp:

2005-05-12T14:52:45+12:00 (19 years ago)

Author:

kjdon

Message:

OK, changed my mind about making SQLConnection kill off the previous statement.
To make it more transparent what is happening, you now have to create a Statement (connection.createStatement()), then use the Statement to execute the query. This means that the thing doing the query owns the Statement, and can kill it off when finished with it, and nothing else can kill it off unexpectedly. The previous way this was all implemented meant that there was a large memory leak, and some functionality actually relied on this. A newer version of the mysql connector/J has fixed the bug where the statement wasn't closed on garbage collection, but it still seems better to close it explicitly.
Hopefully I have got it all back to working as well as it was bfore, and haven't introduced any bugs :-)

File:

• branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java (modified) (3 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java

@@ -27 +27 @@
     String lastBuild = dateToSqlString(collManager.getBuildDate());
     System.out.println("last build was " + lastBuild);
-    Statement statement = collManager.getDatabase().createStatement();
         try {
+        Statement statement = collManager.getDatabase().createStatement();
             // detect all new documents. A document is new if and only if
             // AccessionDate >= CollectionLastRebuiltDate
@@ -130 +130 @@
     private String getDocumentTitle(String documentID, GS3SQLConnection database) {
         System.out.println("getting title for document " + documentID + " from database");
-        Statement statement = database.createStatement();
 
-        ResultSet results;
         try {
+        Statement statement = database.createStatement();
             String sqlString = "SELECT mdvalues.value " +
         "FROM structure s JOIN divisions d ON (s.structureref = d.parentref) " +
@@ -144 +143 @@
         "                                 AND d.parenttype = 'Structure' " + 
         "                                 AND m.docID = s.docid;";
-            results = statement.executeQuery(sqlString);
-            if (results.next()) {
+            ResultSet results = statement.executeQuery(sqlString);
+            if (results.first()) {
                 String title = results.getString("value");
                 System.out.println("title is " + title);