Changeset 31579

Show
Ignore:
Timestamp:
06.04.2017 18:58:07 (2 years ago)
Author:
ak19
Message:

Correction.

Location:
main/trunk/greenstone3/src/java/org/greenstone
Files:
2 modified

Legend:

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

    r31414 r31579  
    151151    logger.warn("oai-inf database for collection + " + this.cluster_name + " does not exist."); 
    152152    oaiinf_db = null; 
    153     } else if (!this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) { 
    154     logger.warn("Could not open oai-inf database for collection + " + this.cluster_name + "!"); 
    155     oaiinf_db = null; 
     153    } else { 
     154    logger.info("Going to try opening oai-inf database for collection " + this.cluster_name); 
     155    if (!this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) { 
     156        logger.warn("Could not open oai-inf database for collection " + this.cluster_name + "!"); 
     157        oaiinf_db = null; 
     158    } 
    156159    } 
    157160     
  • main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

    r31578 r31579  
    129129        // monitor for any error messages 
    130130            errorGobbler // ReaderFromProcessOutputStream 
    131         = new SafeProcess.InputStreamGobbler(prcs.getErrorStream(), splitStdOutputNewLines); 
     131        = new SafeProcess.InputStreamGobbler(prcs.getErrorStream(), splitStdErrorNewLines); 
    132132 
    133133            // monitor for the expected std output line(s) 
    134134            outputGobbler 
    135         = new SafeProcess.InputStreamGobbler(prcs.getInputStream(), splitStdErrorNewLines); 
     135        = new SafeProcess.InputStreamGobbler(prcs.getInputStream(), splitStdOutputNewLines); 
    136136                     
    137137        // register line by line handlers, if any were set, for the process stderr and stdout streams