Changeset 32829 for main

Show
Ignore:
Timestamp:
28.02.2019 18:45:17 (10 months 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

    r32828 r32829  
    8181  public void cleanUp() { 
    8282    super.cleanUp();//?? 
    83     this.coll_db.closeDatabase(); 
     83     
     84    if(this.coll_db != null) {       
     85        this.coll_db.closeDatabase(); 
     86        this.coll_db = null; 
     87    } 
    8488    if (this.oaiinf_db != null){ 
    8589        this.oaiinf_db.closeDatabase();