Changeset 32829 for main/trunk/greenstone3

Timestamp:

2019-02-28T18:45:17+13:00 (5 years ago)

Author:

ak19

Message:

Related to previous commit: coll_db may not be instantiated if oaiserver servlet has not been visited and only library servlet has been visited. So cleanUp() shouldn't try closing the coll_db handle if it's still null.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

@@ -81 +81 @@
   public void cleanUp() {
     super.cleanUp();//??
-    this.coll_db.closeDatabase();
+    
+    if(this.coll_db != null) {      
+        this.coll_db.closeDatabase();
+        this.coll_db = null;
+    }
     if (this.oaiinf_db != null){
         this.oaiinf_db.closeDatabase();