Handle errors better, prevent null ptr exc in Extract

This commit is contained in:
adam-m 2012-09-24 14:08:41 -04:00
parent 4df34868ba
commit aef802f134
2 changed files with 4 additions and 4 deletions

View File

@ -36,7 +36,7 @@ abstract public class Extract implements IngestModuleImage{
protected Case currentCase = Case.getCurrentCase(); // get the most updated case
protected SleuthkitCase tskCase = currentCase.getSleuthkitCase();
public final Logger logger = Logger.getLogger(this.getClass().getName());
protected ArrayList<String> errorMessages = null;
protected final ArrayList<String> errorMessages = new ArrayList<String>();
protected String moduleName = "";
//hide public constructor to prevent from instantiation by ingest module loader
@ -45,9 +45,6 @@ abstract public class Extract implements IngestModuleImage{
}
List<String> getErrorMessages() {
if(errorMessages == null) {
errorMessages = new ArrayList<String>();
}
return errorMessages;
}

View File

@ -163,6 +163,9 @@ public class SearchEngineURLQueryAnalyzer extends Extract implements IngestModul
*/
private static SearchEngine getSearchEngine(String domain){
if (engines == null) {
return SearchEngineURLQueryAnalyzer.NullEngine;
}
for(int i = 0; i < engines.length; i++){
if(domain.contains(engines[i].getDomainSubstring())){
return engines[i];